james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r576203 - in /james/server/trunk: ./ stage/com.thoughtworks.xstream/ stage/com.thoughtworks.xstream/jars/ stage/com.thoughtworks.xstream/poms/
Date Sun, 16 Sep 2007 22:55:26 GMT
Author: bago
Date: Sun Sep 16 15:55:25 2007
New Revision: 576203

URL: http://svn.apache.org/viewvc?rev=576203&view=rev
Log:
SVN should do atomic commit, but it doesn't seem so.
xstream was not committed, so I updated it to 1.2.2 (latest available) and added it to LICENSE.txt
(part of JAMES-797)

Added:
    james/server/trunk/stage/com.thoughtworks.xstream/
    james/server/trunk/stage/com.thoughtworks.xstream/jars/
    james/server/trunk/stage/com.thoughtworks.xstream/jars/xstream-1.2.2.jar   (with props)
    james/server/trunk/stage/com.thoughtworks.xstream/jars/xstream.LICENSE
    james/server/trunk/stage/com.thoughtworks.xstream/poms/
    james/server/trunk/stage/com.thoughtworks.xstream/poms/xstream-1.2.2.pom
Modified:
    james/server/trunk/LICENSE.txt
    james/server/trunk/include.properties
    james/server/trunk/pom.xml

Modified: james/server/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/james/server/trunk/LICENSE.txt?rev=576203&r1=576202&r2=576203&view=diff
==============================================================================
--- james/server/trunk/LICENSE.txt (original)
+++ james/server/trunk/LICENSE.txt Sun Sep 16 15:55:25 2007
@@ -226,4 +226,7 @@
    
    XSDLib, BSD License
      (see phoenix-deployment/phoenix-bin/tools/lib/xsdlib.LICENSE)
-   
\ No newline at end of file
+     
+   XStream, BSD License
+     (see stage/com.thoughtworks.xstream/jars/xstream.LICENSE)
+     
\ No newline at end of file

Modified: james/server/trunk/include.properties
URL: http://svn.apache.org/viewvc/james/server/trunk/include.properties?rev=576203&r1=576202&r2=576203&view=diff
==============================================================================
--- james/server/trunk/include.properties (original)
+++ james/server/trunk/include.properties Sun Sep 16 15:55:25 2007
@@ -196,7 +196,7 @@
 commons-logging.jar=${path.lib.commonslogging}/${jarname.commons-logging.jar}
 jarname.jdom.jar=jdom-1.0.jar
 jdom.jar=${path.lib.jdom}/${jarname.jdom.jar}
-jarname.xstream.jar=xstream-1.2.jar
+jarname.xstream.jar=xstream-1.2.2.jar
 xstream.jar=${path.lib.xstream}/${jarname.xstream.jar}
 
 # ----- torque -----

Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=576203&r1=576202&r2=576203&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Sun Sep 16 15:55:25 2007
@@ -718,7 +718,7 @@
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
-      <version>1.2</version>
+      <version>1.2.2</version>
     </dependency>
     <dependency>
       <groupId>mx4j</groupId>

Added: james/server/trunk/stage/com.thoughtworks.xstream/jars/xstream-1.2.2.jar
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/com.thoughtworks.xstream/jars/xstream-1.2.2.jar?rev=576203&view=auto
==============================================================================
Binary file - no diff available.

Propchange: james/server/trunk/stage/com.thoughtworks.xstream/jars/xstream-1.2.2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: james/server/trunk/stage/com.thoughtworks.xstream/jars/xstream.LICENSE
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/com.thoughtworks.xstream/jars/xstream.LICENSE?rev=576203&view=auto
==============================================================================
--- james/server/trunk/stage/com.thoughtworks.xstream/jars/xstream.LICENSE (added)
+++ james/server/trunk/stage/com.thoughtworks.xstream/jars/xstream.LICENSE Sun Sep 16 15:55:25
2007
@@ -0,0 +1,28 @@
+(BSD Style License)
+
+Copyright (c) 2003-2006, Joe Walnes
+Copyright (c) 2006-2007, XStream Committers
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of
+conditions and the following disclaimer. Redistributions in binary form must reproduce
+the above copyright notice, this list of conditions and the following disclaimer in
+the documentation and/or other materials provided with the distribution.
+
+Neither the name of XStream nor the names of its contributors may be used to endorse
+or promote products derived from this software without specific prior written
+permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.

Added: james/server/trunk/stage/com.thoughtworks.xstream/poms/xstream-1.2.2.pom
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/com.thoughtworks.xstream/poms/xstream-1.2.2.pom?rev=576203&view=auto
==============================================================================
--- james/server/trunk/stage/com.thoughtworks.xstream/poms/xstream-1.2.2.pom (added)
+++ james/server/trunk/stage/com.thoughtworks.xstream/poms/xstream-1.2.2.pom Sun Sep 16 15:55:25
2007
@@ -0,0 +1,345 @@
+<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>com.thoughtworks.xstream</groupId>
+    <artifactId>xstream-parent</artifactId>
+    <version>1.2.2</version>
+  </parent>
+  <artifactId>xstream</artifactId>
+  <packaging>jar</packaging>
+  <name>XStream Core</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>jdom</groupId>
+      <artifactId>jdom</artifactId>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>com.megginson.sax</groupId>
+      <artifactId>xml-writer</artifactId>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>stax</groupId>
+      <artifactId>stax</artifactId>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>org.codehaus.woodstox</groupId>
+      <artifactId>wstx-asl</artifactId>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>stax</groupId>
+      <artifactId>stax-api</artifactId>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>xom</groupId>
+      <artifactId>xom</artifactId>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>xpp3</groupId>
+      <artifactId>xpp3_min</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>org.codehaus.jettison</groupId>
+      <artifactId>jettison</artifactId>
+      <optional>true</optional>
+    </dependency>
+
+
+    <!-- test-scoped -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>jmock</groupId>
+      <artifactId>jmock</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemProperties>
+            <property>
+              <name>test.src.dir</name>
+              <value>${project.build.testSourceDirectory}</value>
+            </property>
+          </systemProperties>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>jdk15</id>
+      <activation>
+        <jdk>1.5</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <!-- two-stage compile process as a workaround until multiple JDK support is
added
+            http://jira.codehaus.org/browse/MCOMPILER-37 
+          -->
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <source>1.3</source>
+              <target>1.3</target>
+              <excludes>
+                <exclude>**/annotations/*</exclude>
+                <exclude>**/enums/*</exclude>
+              </excludes>
+              <testExcludes>
+                <exclude>**/annotations/*</exclude>
+                <exclude>**/enums/*</exclude>
+                <exclude>**/acceptance/SecurityManagerTest*</exclude>
+              </testExcludes>
+            </configuration>
+            <executions>
+              <execution>
+                <id>compile-jdk15</id>
+                <configuration>
+                  <source>1.5</source>
+                  <target>1.5</target>
+                  <excludes>
+                    <exclude>foo</exclude>
+                    <exclude>foo</exclude>
+                  </excludes>
+                  <testExcludes>
+                    <exclude>foo</exclude>
+                    <exclude>foo</exclude>
+                    <exclude>**/acceptance/SecurityManagerTest*</exclude>
+                  </testExcludes>
+                </configuration>
+                <goals>
+                  <goal>compile</goal>
+                  <goal>testCompile</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-javadoc</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+                <configuration>
+                  <excludePackageNames>
+                    com.thoughtworks.xstream.core.*:com.thoughtworks.xstream.io.xml.xppdom.*
+                  </excludePackageNames>
+                  <links>
+                    <link>http://java.sun.com/j2se/1.5/docs/api</link>
+                  </links>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <!-- Drop this profile if MNG-1910 is applied! -->
+      <id>jdk16</id>
+      <activation>
+        <jdk>1.6</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <!-- two-stage compile process as a workaround until multiple JDK support is
added
+            http://jira.codehaus.org/browse/MCOMPILER-37 
+          -->
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <source>1.3</source>
+              <target>1.3</target>
+              <excludes>
+                <exclude>**/annotations/*</exclude>
+                <exclude>**/enums/*</exclude>
+              </excludes>
+              <testExcludes>
+                <exclude>**/annotations/*</exclude>
+                <exclude>**/enums/*</exclude>
+                <exclude>**/acceptance/SecurityManagerTest*</exclude>
+              </testExcludes>
+            </configuration>
+            <executions>
+              <execution>
+                <id>compile-jdk15</id>
+                <configuration>
+                  <source>1.5</source>
+                  <target>1.5</target>
+                  <excludes>
+                    <exclude>foo</exclude>
+                    <exclude>foo</exclude>
+                  </excludes>
+                  <testExcludes>
+                    <exclude>foo</exclude>
+                    <exclude>foo</exclude>
+                    <exclude>**/acceptance/SecurityManagerTest*</exclude>
+                  </testExcludes>
+                </configuration>
+                <goals>
+                  <goal>compile</goal>
+                  <goal>testCompile</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-javadoc</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+                <configuration>
+                  <excludePackageNames>
+                    com.thoughtworks.xstream.core.*:com.thoughtworks.xstream.io.xml.xppdom.*
+                  </excludePackageNames>
+                  <links>
+                    <link>http://java.sun.com/j2se/1.5/docs/api</link>
+                  </links>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>jdk14</id>
+      <activation>
+        <jdk>1.4</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <source>1.4</source>
+              <target>1.4</target>
+              <excludes>
+                <exclude>**/annotations/*</exclude>
+                <exclude>**/enums/*</exclude>
+              </excludes>
+              <testExcludes>
+                <exclude>**/annotations/*</exclude>
+                <exclude>**/enums/*</exclude>
+                <exclude>**/reflection/PureJavaReflectionProvider15Test*</exclude>
+                <exclude>**/acceptance/SecurityManagerTest*</exclude>
+              </testExcludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>macosx</id>
+      <activation>
+        <os>
+          <name>Mac OS X</name>
+        </os>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <!-- Some apple.awt classes throw UnsupportedOperationException  -->
+                <exclude>**/SwingTest.java</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-report-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>cobertura-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </reporting>
+
+</project>



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message