Restructured the project.
diff --git a/npn-api/pom.xml b/npn-api/pom.xml
deleted file mode 100644
index b597ed5..0000000
--- a/npn-api/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <groupId>org.eclipse.jetty.npn</groupId>
- <artifactId>npn-project</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>npn-api</artifactId>
- <name>Jetty :: Next Protocol Negotiation :: API</name>
-</project>
diff --git a/pom.xml b/pom.xml
index b354f4f..b597ed5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,511 +1,12 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-parent</artifactId>
- <version>20</version>
- </parent>
- <groupId>org.eclipse.jetty.npn</groupId>
- <artifactId>npn-project</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- <name>Jetty :: Next Protocol Negotiation :: Project</name>
- <packaging>pom</packaging>
- <scm>
- <connection>scm:git:http://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.npn.git</connection>
- <developerConnection>scm:git:ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.npn.git</developerConnection>
- <url>http://git.eclipse.org/c/jetty/org.eclipse.jetty.npn.git/tree</url>
- </scm>
- <properties>
- <build-support-version>1.1</build-support-version>
- </properties>
- <build>
- <defaultGoal>install</defaultGoal>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- <verbose>false</verbose>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
- <resourceBundle>org.eclipse.jetty.toolchain:jetty-artifact-remote-resources:1.1</resourceBundle>
- </resourceBundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- source maven plugin creates the source bundle and adds manifest -->
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>process-classes</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifestEntries>
- <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
- <Bundle-Name>${project.name}</Bundle-Name>
- <Bundle-SymbolicName>${bundle-symbolic-name}.source;singleton:=true</Bundle-SymbolicName>
- <Bundle-Vendor>Eclipse.org - Jetty</Bundle-Vendor>
- <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
- <Eclipse-SourceBundle>${bundle-symbolic-name};version="${parsedVersion.osgiVersion}";roots:="."</Eclipse-SourceBundle>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- Build helper maven plugin sets the parsedVersion.osgiVersion property -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>set-osgi-version</id>
- <phase>validate</phase>
- <goals>
- <goal>parse-version</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!-- Enforcer Plugin -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-java</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>[3.0.0,)</version>
- </requireMavenVersion>
- <requireJavaVersion>
- <version>[1.7,)</version>
- <message>[ERROR] OLD JDK [${java.version}] in use. Jetty ${project.version} requires JDK 1.7 or newer</message>
- </requireJavaVersion>
- <versionTxtRule implementation="org.eclipse.jetty.toolchain.enforcer.rules.VersionTxtRule" />
- <versionOsgiRule implementation="org.eclipse.jetty.toolchain.enforcer.rules.RequireOsgiCompatibleVersionRule" />
- <versionRedhatRule implementation="org.eclipse.jetty.toolchain.enforcer.rules.RequireRedhatCompatibleVersionRule" />
- <versionDebianRule implementation="org.eclipse.jetty.toolchain.enforcer.rules.RequireDebianCompatibleVersionRule" />
- </rules>
- </configuration>
- </execution>
- <execution>
- <id>enforce-orbit-deps</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <!-- Banned Dependencies (should use Orbit based versions now) -->
- <bannedDependencies>
- <excludes>
- <exclude>javax.servlet</exclude>
- <exclude>javax.servlet.jsp</exclude>
- <exclude>org.apache.geronimo.specs</exclude>
- <exclude>javax.mail</exclude>
- <exclude>javax.activation</exclude>
- </excludes>
- <!-- allowed combinations -->
- <includes>
- <include>javax.servlet:*:*:*:provided</include>
- <include>javax.servlet.jsp:*:*:*:provided</include>
- </includes>
- <searchTransitive>true</searchTransitive>
- <message>This dependency is banned, use the ORBIT provided dependency instead.</message>
- </bannedDependencies>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- <execution>
- <id>ban-junit.jar</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <bannedDependencies>
- <excludes>
- <exclude>junit:junit:*:jar</exclude>
- </excludes>
- <searchTransitive>true</searchTransitive>
- <message>We use junit-dep.jar, not junit.jar (as the standard junit.jar aggregates too many 3rd party libs inside of it)</message>
- </bannedDependencies>
- </rules>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.jetty.toolchain</groupId>
- <artifactId>jetty-build-support</artifactId>
- <version>${build-support-version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <executions>
- <execution>
- <id>named-logging-enforcement</id>
- <phase>compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <verbose>true</verbose>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <targetJdk>1.7</targetJdk>
- <rulesets>
- <ruleset>jetty/pmd_logging_ruleset.xml</ruleset>
- </rulesets>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.jetty.toolchain</groupId>
- <artifactId>jetty-build-support</artifactId>
- <version>${build-support-version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.jetty.toolchain</groupId>
- <artifactId>jetty-version-maven-plugin</artifactId>
- <version>1.0.7</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>Eclipse.org - Jetty</Implementation-Vendor>
- <url>${jetty.url}</url>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>-showversion -XX:+PrintGCDetails</argLine>
- <failIfNoTests>false</failIfNoTests>
- <!--systemProperties>
- <property>
- <name>org.eclipse.jetty.io.AbstractBuffer.boundsChecking</name>
- <value>true</value>
- </property>
- </systemProperties-->
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
- <Bundle-DocURL>${jetty.url}</Bundle-DocURL>
- <Bundle-Vendor>Eclipse Jetty Project</Bundle-Vendor>
- <Bundle-Classpath>.</Bundle-Classpath>
- <Export-Package>${bundle-symbolic-name}.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
- <Bundle-Copyright>Copyright (c) 2008-2012 Mort Bay Consulting Pty. Ltd.</Bundle-Copyright>
- <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.jetty.toolchain</groupId>
- <artifactId>jetty-assembly-descriptors</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <configuration>
- <findbugsXmlOutput>true</findbugsXmlOutput>
- <xmlOutput>true</xmlOutput>
- <effort>Max</effort>
- <onlyAnalyze>org.eclipse.jetty.*</onlyAnalyze>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <docfilessubdirs>true</docfilessubdirs>
- <detectLinks>false</detectLinks>
- <detectJavaApiLink>true</detectJavaApiLink>
- <excludePackageNames>org.slf4j.*;org.mortbay.*</excludePackageNames>
- <links>
- <link>http://download.eclipse.org/jetty/stable-7/apidocs/</link>
- </links>
- <tags>
- <tag>
- <name>org.apache.xbean.XBean</name>
- <placement>a</placement>
- <head>Apache XBean:</head>
- </tag>
- </tags>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.7.1</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
- <configuration>
- <maxmemory>512m</maxmemory>
- <docfilessubdirs>true</docfilessubdirs>
- <detectLinks>true</detectLinks>
- <detectJavaApiLink>true</detectJavaApiLink>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.7.1</version>
- <configuration>
- <targetJdk>1.5</targetJdk>
- <rulesets>
- <ruleset>jetty/pmd_ruleset.xml</ruleset>
- </rulesets>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
- </plugin>
- </plugins>
- </reporting>
- <repositories>
- <repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>sonatype-snapshots</id>
- <name>Sonatype Jetty Snapshots</name>
- <url>http://oss.sonatype.org/content/groups/jetty</url>
- </repository>
- </repositories>
- <modules>
- <module>npn-api</module>
- </modules>
- <!--
- Usage:
- configure settings.xml for jetty.eclipse.website server entry
- > mvn -N site:deploy
- or
- > mvn -N site:sshdeploy (for ssh users w/passphrase and ssh-agent)
- -->
- <profiles>
- <profile>
- <id>release</id>
- <modules>
- <!--
- <module>jetty-aggregate</module>
- -->
- </modules>
- </profile>
- <profile>
- <id>osgi</id>
- <modules>
- <module>jetty-osgi</module>
- </modules>
- </profile>
- <profile>
- <id>update-version</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.jetty.toolchain</groupId>
- <artifactId>jetty-version-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>gen-versiontxt</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>update-version-text</goal>
- </goals>
- <configuration>
- <refreshTags>true</refreshTags>
- <copyGenerated>true</copyGenerated>
- <attachArtifact>false</attachArtifact>
- <updateDate>true</updateDate>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>maven-3</id>
- <activation>
- <file>
- <!-- This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
- <exists>${basedir}</exists>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-descriptor</id>
- <goals>
- <goal>attach-descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>aggregate-site</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <excludePackageNames>com.acme</excludePackageNames>
- <links>
- <link>http://java.sun.com/javase/6/docs/api/</link>
- <link>http://java.sun.com/javaee/6/docs/api</link>
- <link>http://junit.sourceforge.net/javadoc/</link>
- </links>
- <tags>
- <tag>
- <name>org.apache.xbean.XBean</name>
- <placement>X</placement>
- <head />
- </tag>
- </tags>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>license-check</id>
- <build>
- <plugins>
- <plugin>
- <inherited>false</inherited>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
- <version>1.10.b1</version>
- <configuration>
- <header>header-template.txt</header>
- <failIfMissing>true</failIfMissing>
- <aggregate>true</aggregate>
- <strictCheck>true</strictCheck>
- <properties>
- <copyright-range>${project.inceptionYear}-2012</copyright-range>
- </properties>
- <mapping>
- <java>DOUBLESLASH_STYLE</java>
- </mapping>
- <includes>
- <include>**/*.java</include>
- </includes>
- <excludes>
- <exclude>jetty-util/src/main/java/org/eclipse/jetty/util/security/UnixCrypt.java</exclude>
- <exclude>jetty-policy/src/main/java/org/eclipse/jetty/policy/loader/DefaultPolicyLoader.java</exclude>
- <exclude>jetty-policy/src/main/java/org/eclipse/jetty/policy/loader/PolicyFileScanner.java</exclude>
- <exlcude>jetty-ant/**</exlcude> <!-- short term, need to add support to accept additional copyrights -->
- </excludes>
- </configuration>
- <executions>
- <execution>
- <id>check-headers</id>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.eclipse.jetty.npn</groupId>
+ <artifactId>npn-project</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>npn-api</artifactId>
+ <name>Jetty :: Next Protocol Negotiation :: API</name>
</project>
diff --git a/npn-api/src/main/java/org/eclipse/jetty/npn/NextProtoNego.java b/src/main/java/org/eclipse/jetty/npn/NextProtoNego.java
similarity index 100%
rename from npn-api/src/main/java/org/eclipse/jetty/npn/NextProtoNego.java
rename to src/main/java/org/eclipse/jetty/npn/NextProtoNego.java
