Skip to content
Snippets Groups Projects
Commit fc6687a2 authored by Ryan Izard's avatar Ryan Izard
Browse files

Finally! Maven works a lot better. (1) create single jar with all... 

Finally! Maven works a lot better. (1) create single jar with all dependencies. This is a much larger jar, but it is directly portable to another system... just use -cf and point to the floodlightdefault.properties file. (2) reduce unit test log verbosity... drastically. (3) include version and name in manifest for new version REST API. Note this also includes the web interface in the jar if the web interface submodule has been fetched prior to building the controller.
parent dbb1405e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
pom.xml
+ 44
− 1
View file @ fc6687a2
......@@ -21,6 +21,7 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
......@@ -48,6 +49,10 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>
</plugins>
<pluginManagement>
<plugins>
......@@ -83,6 +88,38 @@
</lifecycleMappingMetadata>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<version>2.5</version>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<archive>
<manifestEntries>
<Class-Path>.</Class-Path>
</manifestEntries>
<manifest>
<!-- <addClasspath>true</addClasspath>
<classpathPrefix>../lib/</classpathPrefix> -->
<mainClass>net.floodlightcontroller.core.Main</mainClass>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
</archive>
<appendAssemblyId>false</appendAssemblyId>
<finalName>floodlight</finalName>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
<resources>
......@@ -92,8 +129,14 @@
<include>LICENSE.txt</include>
<include>NOTICE.txt</include>
<include>README.md</include>
</includes>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
<resource>
<directory>src/test/resources</directory>
</resource>
</resources>
</build>
<dependencies>
......
src/main/resources/logback-test.xml deleted 100644 → 0
+ 0
− 36
View file @ dbb1405e
<configuration scan="true">
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} %level [%logger{20}:%thread] %msg%n</pattern>
</encoder>
</appender>
<root level="DEBUG">
<appender-ref ref="STDOUT" />
<appender-ref ref="EV_WARN_ERR" />
</root>
<logger name="org" level="INFO"/>
<logger name="io" level="INFO"></logger> <!-- Netty logging -->
<logger name="LogService" level="DEBUG"></logger> <!-- Restlet access logging -->
<logger name="net.floodlightcontroller" level="INFO"/>
<logger name="org.sdnplatform" level="INFO"></logger>
<logger name="org.sdnplatform.sync.internal.SyncManager" level="INFO"></logger>
<logger name="org.sdnplatform.sync.internal.config.StorageCCProvider" level="INFO"></logger>
<logger name="org.sdnplatform.sync.internal.config.PropertyCCProvider" level="INFO"></logger>
<logger name="org.sdnplatform.sync.internal.rpc.RPCService" level="INFO"></logger>
<logger name="net.floodlightcontroller.devicemanager.DeviceManagerImpl" level="INFO"></logger>
<logger name="net.floodlightcontroller.linkdiscovery" level="INFO"></logger>
<logger name="net.floodlightcontroller.forwarding.Forwarding" level="INFO"></logger>
<logger name="net.floodlightcontroller.forwarding.ForwardingBase" level="INFO"></logger>
<logger name="net.floodlightcontroller.core" level="INFO"></logger>
<logger name="net.floodlightcontroller.topology" level="INFO" ></logger>
<logger name="org.projectfloodlight.openflow" level="INFO" ></logger>
<logger name="net.floodlightcontroller.core.internal.OFSwitchManager" level="INFO"></logger>
<logger name="net.floodlightcontroller.core.internal.OFSwitchHandshakeHandler" level="INFO"></logger>
<logger name="net.floodlightcontroller.core.internal.OFChannelHandler" level="INFO"></logger>
<logger name="net.floodlightcontroller.staticentry.StaticEntries" level="INFO"></logger>
<logger name="net.floodlightcontroller.staticentry.StaticEntryPusher" level="INFO"></logger>
<logger name="net.floodlightcontroller.simpleft.FT" level="INFO"></logger>
</configuration>
logback.xml → src/main/resources/logback.xml
+ 1
− 1
View file @ fc6687a2
......@@ -8,7 +8,7 @@
<appender-ref ref="STDOUT" />
</root>
<logger name="io" level="INFO"></logger> <!-- Netty logging -->
<logger name="LogService" level="INFO"/> <!-- Restlet access logging -->
<logger name="LogService" level="WARN"/> <!-- Restlet access logging -->
<logger name="net.floodlightcontroller" level="INFO"/>
<logger name="org.sdnplatform" level="INFO"/>
</configuration>
src/test/resources/logback.xml 0 → 100644
+ 14
− 0
View file @ fc6687a2
<configuration scan="true">
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%date{yyyy-MM-dd HH:mm:ss.S} %-5level [%logger{15}] %msg%n</pattern>
</encoder>
</appender>
<root level="INFO">
<appender-ref ref="STDOUT" />
</root>
<logger name="io" level="ERROR"></logger> <!-- Netty logging -->
<logger name="LogService" level="ERROR"/> <!-- Restlet access logging -->
<logger name="net.floodlightcontroller" level="ERROR"/>
<logger name="org.sdnplatform" level="ERROR"/>
</configuration>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment