svn commit: r956176 - in /incubator/chemistry/opencmis/branches/dev-maven-release: ant-release-tool/ chemistry-opencmis-client/chemistry-opencmis-client-bindings/ chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/ chemistry-ope...

[ga...@apache.org]

Author: gabriele
Date: Sat Jun 19 03:24:23 2010
New Revision: 956176

URL: http://svn.apache.org/viewvc?rev=956176&view=rev
Log:
readying for merge. removed release tool. added filtering to some test resources to avoid logging in project folder. fixed client-with-deps assembly

Added:
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/resources/
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/resources/log4j.properties   (contents, props changed)
      - copied, changed from r955973, incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/log4j.properties
Removed:
    incubator/chemistry/opencmis/branches/dev-maven-release/ant-release-tool/
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/log4j.properties
Modified:
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-dependencies-assembly.xml

Modified: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml?rev=956176&r1=956175&r2=956176&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml Sat Jun 19 03:24:23 2010
@@ -62,4 +62,15 @@
             <url>http://download.java.net/maven/2/</url>
         </pluginRepository>
     </pluginRepositories>
+    
+    
+    <build>
+        <testResources>
+            <!-- Added to avoid logging in the base project folder and filter log4j.properties  -->
+            <testResource>
+                <directory>src/test/resources</directory>
+                <filtering>true</filtering>
+            </testResource>
+        </testResources>
+    </build>
 </project>

Copied: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/resources/log4j.properties (from r955973, incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/log4j.properties)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/resources/log4j.properties?p2=incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/resources/log4j.properties&p1=incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/log4j.properties&r1=955973&r2=956176&rev=956176&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/log4j.properties (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/resources/log4j.properties Sat Jun 19 03:24:23 2010
@@ -7,7 +7,7 @@ log4j.appender.O=org.apache.log4j.Consol
 
 # File
 log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=log4j.log
+log4j.appender.R.File=${project.build.directory}/log4j.log
 
 # Control the maximum log file size
 log4j.appender.R.MaxFileSize=100KB

Propchange: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-dependencies-assembly.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-dependencies-assembly.xml?rev=956176&r1=956175&r2=956176&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-dependencies-assembly.xml (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-dependencies-assembly.xml Sat Jun 19 03:24:23 2010
@@ -14,12 +14,4 @@
       <scope>runtime</scope>
     </dependencySet>
   </dependencySets>
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.directory}</directory>
-      <includes>
-          <include>${project.build.finalName}.jar</include>
-      </includes>
-    </fileSet>
-  </fileSets>
 </assembly>
\ No newline at end of file