Author: erodriguez Date: Sat Jan 22 21:17:57 2005 New Revision: 126197 URL: http://svn.apache.org/viewcvs?view=rev&rev=126197 Log: DHCP maven infrastructure for multiproject build and javaapp executable jar. Added: incubator/directory/dhcp/trunk/core/project.properties incubator/directory/dhcp/trunk/core/project.xml incubator/directory/dhcp/trunk/main/project.properties incubator/directory/dhcp/trunk/main/project.xml incubator/directory/dhcp/trunk/project.properties incubator/directory/dhcp/trunk/project.xml incubator/directory/dhcp/trunk/protocol/project.properties incubator/directory/dhcp/trunk/protocol/project.xml Modified: incubator/directory/dhcp/trunk/core/ (props changed) incubator/directory/dhcp/trunk/core/src/java/org/apache/dhcp/io/DhcpMessageDecoder.java incubator/directory/dhcp/trunk/main/ (props changed) incubator/directory/dhcp/trunk/protocol/ (props changed)
Added: incubator/directory/dhcp/trunk/core/project.properties Url: http://svn.apache.org/viewcvs/incubator/directory/dhcp/trunk/core/project.properties?view=auto&rev=126197 ============================================================================== --- (empty file) +++ incubator/directory/dhcp/trunk/core/project.properties Sat Jan 22 21:17:57 2005 @@ -0,0 +1,4 @@ +maven.xdoc.includeProjectDocumentation=yes +maven.license.licenseFile=${basedir}/../LICENSE.txt +module.path=core + Added: incubator/directory/dhcp/trunk/core/project.xml Url: http://svn.apache.org/viewcvs/incubator/directory/dhcp/trunk/core/project.xml?view=auto&rev=126197 ============================================================================== --- (empty file) +++ incubator/directory/dhcp/trunk/core/project.xml Sat Jan 22 21:17:57 2005 @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project> + <extend>${basedir}/../project.xml</extend> + <pomVersion>1</pomVersion> + <artifactId>dhcp-core</artifactId> + <groupId>incubator-directory</groupId> + <id>dhcp-core</id> + <name>DHCP Server Core</name> + <package>org.apache.dhcp</package> + <inceptionYear>2005</inceptionYear> + <shortDescription>The Apache DHCP Server Core</shortDescription> + <description> + A DHCP protocol server. + </description> +</project> + Modified: incubator/directory/dhcp/trunk/core/src/java/org/apache/dhcp/io/DhcpMessageDecoder.java Url: http://svn.apache.org/viewcvs/incubator/directory/dhcp/trunk/core/src/java/org/apache/dhcp/io/DhcpMessageDecoder.java?view=diff&rev=126197&p1=incubator/directory/dhcp/trunk/core/src/java/org/apache/dhcp/io/DhcpMessageDecoder.java&r1=126196&p2=incubator/directory/dhcp/trunk/core/src/java/org/apache/dhcp/io/DhcpMessageDecoder.java&r2=126197 ============================================================================== --- incubator/directory/dhcp/trunk/core/src/java/org/apache/dhcp/io/DhcpMessageDecoder.java (original) +++ incubator/directory/dhcp/trunk/core/src/java/org/apache/dhcp/io/DhcpMessageDecoder.java Sat Jan 22 21:17:57 2005 @@ -23,7 +23,6 @@ import org.apache.dhcp.messages.DhcpMessage; import org.apache.dhcp.messages.DhcpMessageModifier; import org.apache.dhcp.messages.MessageType; -import org.apache.dns.io.ByteBufferCodec; public class DhcpMessageDecoder @@ -48,7 +47,7 @@ modifier.setOpCode( buffer.get() ); modifier.setHardwareAddressType( buffer.get() ); - short hardwareAddressLength = ByteBufferCodec.getUnsignedByte( buffer ); + short hardwareAddressLength = (short)( buffer.get() & 0xff ); modifier.setHardwareAddressLength( (byte)hardwareAddressLength ); modifier.setHardwareOptions( buffer.get() ); Added: incubator/directory/dhcp/trunk/main/project.properties Url: http://svn.apache.org/viewcvs/incubator/directory/dhcp/trunk/main/project.properties?view=auto&rev=126197 ============================================================================== --- (empty file) +++ incubator/directory/dhcp/trunk/main/project.properties Sat Jan 22 21:17:57 2005 @@ -0,0 +1,14 @@ +maven.xdoc.includeProjectDocumentation=yes +maven.license.licenseFile=${basedir}/../LICENSE.txt +module.path=main + +# +# Javaapp plugin properties +# + +maven.javaapp.jar.exclude=junit, maven-javaapp-plugin +maven.javaapp.mainclass=org.apache.dhcp.Main +maven.javaapp.jar.name=${maven.final.name}.jar +maven.javaapp.sysproperties= +maven.javaapp.jvmargs= + Added: incubator/directory/dhcp/trunk/main/project.xml Url: http://svn.apache.org/viewcvs/incubator/directory/dhcp/trunk/main/project.xml?view=auto&rev=126197 ============================================================================== --- (empty file) +++ incubator/directory/dhcp/trunk/main/project.xml Sat Jan 22 21:17:57 2005 @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project> + <extend>${basedir}/../project.xml</extend> + <artifactId>dhcp</artifactId> + <name>DHCP Server Main</name> + <inceptionYear>2005</inceptionYear> + <shortDescription>A DHCP Server executable jar.</shortDescription> + + <description> + A single executable DHCP Server jar containing all dependencies. + </description> + + <!-- Need to have all dependencies here so appjar bundles them --> + + <dependencies> + <dependency> + <groupId>incubator-directory</groupId> + <artifactId>mina</artifactId> + <version>0.7-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>incubator-directory</groupId> + <artifactId>dhcp-core</artifactId> + <version>0.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>incubator-directory</groupId> + <artifactId>dhcp-protocol</artifactId> + <version>0.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>maven-plugins</groupId> + <artifactId>maven-javaapp-plugin</artifactId> + <version>1.3</version> + <type>plugin</type> + </dependency> + </dependencies> +</project> + Added: incubator/directory/dhcp/trunk/project.properties Url: http://svn.apache.org/viewcvs/incubator/directory/dhcp/trunk/project.properties?view=auto&rev=126197 ============================================================================== --- (empty file) +++ incubator/directory/dhcp/trunk/project.properties Sat Jan 22 21:17:57 2005 @@ -0,0 +1,21 @@ +maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory +maven.license.licenseFile=../LICENSE.txt +maven.xdoc.date=left +maven.xdoc.includeProjectDocumentation=no +maven.xdoc.poweredby.image= + +# +# remote repository properties +# + +maven.repo.remote=http://cvs.apache.org/repository, http://ibiblio.org/maven +maven.multiproject.includes=*/project.xml +maven.repo.list=apachecvs +maven.repo.apachecvs=scp://cvs.apache.org +maven.repo.apachecvs.directory=/www/cvs.apache.org/repository +maven.repo.apachecvs.group=apcvs + +maven.gump.module.name=dhcp + +maven.site.stage.directory=/home/akarasulu/public_html/rsynced-sites/directory/subprojects/dhcp + Added: incubator/directory/dhcp/trunk/project.xml Url: http://svn.apache.org/viewcvs/incubator/directory/dhcp/trunk/project.xml?view=auto&rev=126197 ============================================================================== --- (empty file) +++ incubator/directory/dhcp/trunk/project.xml Sat Jan 22 21:17:57 2005 @@ -0,0 +1,137 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project> + <groupId>incubator-directory</groupId> + <id>dhcp-parent</id> + <name>Apache DHCP Server</name> + <version>SNAPSHOT</version> + <currentVersion>0.1-SNAPSHOT</currentVersion> + + <organization> + <name>The Apache Incubator</name> + <url>http://incubator.apache.org</url> + <logo>http://incubator.apache.org/directory/images/apache-incubator-logo.png</logo> + </organization> + + <inceptionYear>2005</inceptionYear> + <package>org.apache.dhcp</package> + + <issueTrackingUrl>http://nagoya.apache.org/jira/browse/DIRKERBEROS</issueTrackingUrl> + + <logo>http://incubator.apache.org/directory/images/apache-directory-logo.png</logo> + <url>http://incubator.apache.org/directory/subprojects/kerberos</url> + + <gumpRepositoryId>apache-incubator-svn</gumpRepositoryId> + + <repository> + <connection> + scm:svn:http://cvs.apache.org/repos/asf/incubator:directory/dhcp/trunk/${module.path} + </connection> + + <url> + http://cvs.apache.org/viewcvs.cgi/incubator/directory/dhcp/trunk/${module.path}/?root=Apache-SVN + </url> + + <developerConnection> + https://cvs.apache.org/repos/asf/incubator:directory/dhcp/trunk/${module.path} + </developerConnection> + </repository> + + <shortDescription>DHCP Server</shortDescription> + + <description> + An embeddable DHCP Server. + </description> + + <mailingLists> + <mailingList> + <name>Apache Directory Development - use [dhcp] prefix</name> + <subscribe> + [EMAIL PROTECTED] + </subscribe> + <unsubscribe> + [EMAIL PROTECTED] + </unsubscribe> + <archive> + http://nagoya.apache.org/eyebrowse/SummarizeList?listId=181 + </archive> + </mailingList> + </mailingLists> + + <licenses> + <license> + <name>Apache 1.1 License</name> + <url> + http://cvs.apache.org/viewcvs.cgi/incubator/directory/LICENSE.txt?rev=1369&root=Apache-SVN&view=markup + </url> + <distribution>repo</distribution> + </license> + </licenses> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <url>http://junit.org</url> + </dependency> + </dependencies> + + <build> + <nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress> + <sourceDirectory>${basedir}/src/java</sourceDirectory> + <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory> + <integrationUnitTestSourceDirectory/> + <aspectSourceDirectory/> + + <unitTest> + <includes> + <include>**/*Test*</include> + <include>**/*TestCase*</include> + </includes> + + <excludes> + <exclude>**/Abstract*Test*</exclude> + <exclude>**/*TestUtils*</exclude> + <exclude>**/*TestCase*</exclude> + </excludes> + + <resources> + <resource> + <directory>${basedir}/src/test</directory> + <includes> + <include>**/*.dtd</include> + <include>**/*.ldif</include> + <include>**/*.properties</include> + <include>**/*.x*</include> + <include>**/*.mf</include> + <include>**/*.jar</include> + <include>**/*.pdu</include> + </includes> + </resource> + </resources> + </unitTest> + + <resources> + <resource> + <directory>${basedir}/src/java</directory> + <includes> + <include>**/*.dtd</include> + <include>**/*.properties</include> + <include>**/*.ldif</include> + <include>**/*.x*</include> + </includes> + </resource> + + <resource> + <directory>${basedir}/etc</directory> + <targetPath>org/apache/dhcp</targetPath> + <includes> + <include>*.properties</include> + </includes> + </resource> + </resources> + <jars></jars> + </build> +</project> + Added: incubator/directory/dhcp/trunk/protocol/project.properties Url: http://svn.apache.org/viewcvs/incubator/directory/dhcp/trunk/protocol/project.properties?view=auto&rev=126197 ============================================================================== --- (empty file) +++ incubator/directory/dhcp/trunk/protocol/project.properties Sat Jan 22 21:17:57 2005 @@ -0,0 +1,4 @@ +maven.xdoc.includeProjectDocumentation=yes +maven.license.licenseFile=${basedir}/../LICENSE.txt +module.path=protocol + Added: incubator/directory/dhcp/trunk/protocol/project.xml Url: http://svn.apache.org/viewcvs/incubator/directory/dhcp/trunk/protocol/project.xml?view=auto&rev=126197 ============================================================================== --- (empty file) +++ incubator/directory/dhcp/trunk/protocol/project.xml Sat Jan 22 21:17:57 2005 @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project> + <extend>${basedir}/../project.xml</extend> + <pomVersion>1</pomVersion> + <artifactId>dhcp-protocol</artifactId> + <groupId>incubator-directory</groupId> + <id>dhcp-protocol</id> + <name>DHCP Server Protocol Front-End</name> + <package>org.apache.dhcp</package> + <inceptionYear>2005</inceptionYear> + <shortDescription>Apache DHCP Front-End</shortDescription> + <description> + The Apache DHCP protocol front-end. + </description> + <dependencies> + <dependency> + <groupId>incubator-directory</groupId> + <artifactId>mina</artifactId> + <version>0.7-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>incubator-directory</groupId> + <artifactId>dhcp-core</artifactId> + <version>0.1-SNAPSHOT</version> + </dependency> + </dependencies> +</project> +
