You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@abdera.apache.org by jm...@apache.org on 2012/02/02 17:22:04 UTC
svn commit: r1239706 - in /abdera/abdera2-server: .classpath activities/
activities/src/ activities/src/main/ activities/src/main/java/
examples/pom.xml pom.xml server/pom.xml test/pom.xml
Author: jmsnell
Date: Thu Feb 2 16:22:04 2012
New Revision: 1239706
URL: http://svn.apache.org/viewvc?rev=1239706&view=rev
Log:
project fixup....
Added:
abdera/abdera2-server/activities/
abdera/abdera2-server/activities/src/
abdera/abdera2-server/activities/src/main/
abdera/abdera2-server/activities/src/main/java/
Modified:
abdera/abdera2-server/.classpath
abdera/abdera2-server/examples/pom.xml
abdera/abdera2-server/pom.xml
abdera/abdera2-server/server/pom.xml
abdera/abdera2-server/test/pom.xml
Modified: abdera/abdera2-server/.classpath
URL: http://svn.apache.org/viewvc/abdera/abdera2-server/.classpath?rev=1239706&r1=1239705&r2=1239706&view=diff
==============================================================================
--- abdera/abdera2-server/.classpath (original)
+++ abdera/abdera2-server/.classpath Thu Feb 2 16:22:04 2012
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="activities/src/main/java"/>
- <classpathentry kind="src" path="client/src/main/java"/>
- <classpathentry kind="src" path="common/src/main/java"/>
<classpathentry kind="src" path="examples/src/main/java"/>
<classpathentry kind="src" path="server/src/main/java"/>
<classpathentry kind="src" path="test/src/main/java"/>
Modified: abdera/abdera2-server/examples/pom.xml
URL: http://svn.apache.org/viewvc/abdera/abdera2-server/examples/pom.xml?rev=1239706&r1=1239705&r2=1239706&view=diff
==============================================================================
--- abdera/abdera2-server/examples/pom.xml (original)
+++ abdera/abdera2-server/examples/pom.xml Thu Feb 2 16:22:04 2012
@@ -1,13 +1,13 @@
<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">
<parent>
<groupId>org.apache.abdera2</groupId>
- <artifactId>abdera2</artifactId>
+ <artifactId>abdera2-server-project</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>abdera2-examples</artifactId>
+ <artifactId>abdera2-server-examples</artifactId>
<packaging>jar</packaging>
- <name>Abdera2 Examples</name>
+ <name>Abdera2 Server Examples</name>
<version>2.0-SNAPSHOT</version>
<description>Atom Specification Implementation Examples</description>
@@ -22,29 +22,24 @@
</dependency>
<dependency>
<groupId>org.apache.abdera2</groupId>
- <artifactId>abdera2-client</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <artifactId>abdera2-activities</artifactId>
</dependency>
<dependency>
<groupId>org.apache.abdera2</groupId>
- <artifactId>abdera2-server</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.abdera2</groupId>
- <artifactId>abdera2-activities</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <artifactId>abdera2-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.abdera2</groupId>
<artifactId>abdera2-security</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>${jetty.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ </dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-web-api</artifactId>
Modified: abdera/abdera2-server/pom.xml
URL: http://svn.apache.org/viewvc/abdera/abdera2-server/pom.xml?rev=1239706&r1=1239705&r2=1239706&view=diff
==============================================================================
--- abdera/abdera2-server/pom.xml (original)
+++ abdera/abdera2-server/pom.xml Thu Feb 2 16:22:04 2012
@@ -367,185 +367,37 @@
<dependencyManagement>
<dependencies>
-
<dependency>
<groupId>org.apache.abdera2</groupId>
<artifactId>abdera2-common</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>org.apache.abdera2</groupId>
<artifactId>abdera2-core</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>org.apache.abdera2</groupId>
<artifactId>abdera2-activities</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.abdera2</groupId>
- <artifactId>abdera2-client</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
<dependency>
<groupId>org.apache.abdera2</groupId>
<artifactId>abdera2-ext</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>org.apache.abdera2</groupId>
<artifactId>abdera2-security</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
-
-
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.1.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- <version>4.1.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.1.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-cache</artifactId>
- <version>4.1.2</version>
- </dependency>
-
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>1.7.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- <version>1.2.12</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- <version>1.2.12</version>
- <exclusions>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.1</version>
- </dependency>
-
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-web-api</artifactId>
<version>6.0</version>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- <version>4.8.1.1</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.9</version>
- <scope>test, compile, package</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.6</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1.1</version>
- <exclusions>
- <exclusion>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xom</groupId>
- <artifactId>xom</artifactId>
- </exclusion>
- <exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.santuario</groupId>
- <artifactId>xmlsec</artifactId>
- <version>1.4.5</version>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- </dependency>
-
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>2.0.2</version>
- </dependency>
-
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
@@ -556,203 +408,20 @@
<artifactId>jetty-servlet</artifactId>
<version>8.0.0.v20110901</version>
</dependency>
-
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.8.5</version>
- </dependency>
-
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.0</version>
- </dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>11.0</version>
- </dependency>
-
- <dependency>
- <groupId>nu.validator.htmlparser</groupId>
- <artifactId>htmlparser</artifactId>
- <version>1.2.1</version>
- </dependency>
-
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>2.0</version>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.abdera2</groupId>
- <artifactId>abdera2-common</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.abdera2</groupId>
- <artifactId>abdera2-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.abdera2</groupId>
- <artifactId>abdera2-activities</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.abdera2</groupId>
- <artifactId>abdera2-client</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.abdera2</groupId>
- <artifactId>abdera2-ext</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.abdera2</groupId>
- <artifactId>abdera2-security</artifactId>
- </dependency>
-
-
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-cache</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-web-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- </dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>4.9</version>
<scope>test, compile, package</scope>
</dependency>
-
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.santuario</groupId>
- <artifactId>xmlsec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- </dependency>
-
- <dependency>
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
+ <version>3.0</version>
</dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
- <dependency>
- <groupId>nu.validator.htmlparser</groupId>
- <artifactId>htmlparser</artifactId>
- </dependency>
-
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- </dependency>
-
</dependencies>
-
+ </dependencyManagement>
+
<modules>
<module>server</module>
<module>test</module>
Modified: abdera/abdera2-server/server/pom.xml
URL: http://svn.apache.org/viewvc/abdera/abdera2-server/server/pom.xml?rev=1239706&r1=1239705&r2=1239706&view=diff
==============================================================================
--- abdera/abdera2-server/server/pom.xml (original)
+++ abdera/abdera2-server/server/pom.xml Thu Feb 2 16:22:04 2012
@@ -44,17 +44,38 @@
</properties>
<dependencies>
- <dependency>
- <groupId>org.apache.abdera2</groupId>
- <artifactId>abdera2-core</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.abdera2</groupId>
- <artifactId>abdera2-common</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.abdera2</groupId>
+ <artifactId>abdera2-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.abdera2</groupId>
+ <artifactId>abdera2-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.abdera2</groupId>
+ <artifactId>abdera2-activities</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.abdera2</groupId>
+ <artifactId>abdera2-ext</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.abdera2</groupId>
+ <artifactId>abdera2-security</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax</groupId>
+ <artifactId>javaee-web-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: abdera/abdera2-server/test/pom.xml
URL: http://svn.apache.org/viewvc/abdera/abdera2-server/test/pom.xml?rev=1239706&r1=1239705&r2=1239706&view=diff
==============================================================================
--- abdera/abdera2-server/test/pom.xml (original)
+++ abdera/abdera2-server/test/pom.xml Thu Feb 2 16:22:04 2012
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.abdera2</groupId>
- <artifactId>abdera2</artifactId>
+ <artifactId>abdera2-server-project</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
- <artifactId>abdera2-test</artifactId>
+ <artifactId>abdera2-server-test</artifactId>
<packaging>bundle</packaging>
- <name>Abdera2 Tests</name>
+ <name>Abdera2 Server Tests</name>
<version>2.0-SNAPSHOT</version>
<description>Abdera Tests</description>
@@ -55,18 +55,6 @@
</dependency>
<dependency>
<groupId>org.apache.abdera2</groupId>
- <artifactId>abdera2-server</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.abdera2</groupId>
- <artifactId>abdera2-client</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.abdera2</groupId>
<artifactId>abdera2-security</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>compile</scope>
@@ -92,10 +80,12 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>