Author: rmannibucau
Date: Thu Aug 4 09:13:23 2011
New Revision: 1153800
URL: http://svn.apache.org/viewvc?rev=1153800&view=rev
Log:
updating headers
Modified:
openejb/trunk/openejb3/assembly/javaee-api-libs/pom.xml
openejb/trunk/openejb3/assembly/openejb-itests-standalone-client/pom.xml
openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
openejb/trunk/openejb3/container/openejb-activemq4/pom.xml
openejb/trunk/openejb3/container/openejb-core/pom.xml
openejb/trunk/openejb3/container/openejb-spring/pom.xml
openejb/trunk/openejb3/examples/applicationexception/pom.xml
openejb/trunk/openejb3/examples/webservice-ws-security/pom.xml
openejb/trunk/openejb3/itests/openejb-itests-app/pom.xml
openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml
openejb/trunk/openejb3/server/openejb-http/pom.xml
openejb/trunk/openejb3/server/openejb-webadmin/pom.xml
openejb/trunk/openejb3/tck/cdi-embedded/pom.xml
openejb/trunk/openejb3/tck/cdi-tomee/pom.xml
Modified: openejb/trunk/openejb3/assembly/javaee-api-libs/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/javaee-api-libs/pom.xml?rev=1153800&r1=1153799&r2=1153800&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/javaee-api-libs/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/javaee-api-libs/pom.xml Thu Aug 4 09:13:23
2011
@@ -67,7 +67,9 @@
</executions>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
- <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
<finalName>javaee-api-libs-${project.version}</finalName>
</configuration>
</plugin>
Modified:
openejb/trunk/openejb3/assembly/openejb-itests-standalone-client/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-itests-standalone-client/pom.xml?rev=1153800&r1=1153799&r2=1153800&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-itests-standalone-client/pom.xml
(original)
+++ openejb/trunk/openejb3/assembly/openejb-itests-standalone-client/pom.xml
Thu Aug 4 09:13:23 2011
@@ -45,7 +45,9 @@
</executions>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
- <descriptor>src/main/assembly/client.xml</descriptor>
+ <descriptors>
+ <descriptor>src/main/assembly/client.xml</descriptor>
+ </descriptors>
<archive>
<manifest>
<mainClass>org.apache.openejb.test.Main</mainClass>
Modified: openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml?rev=1153800&r1=1153799&r2=1153800&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml Thu Aug 4
09:13:23 2011
@@ -112,7 +112,9 @@
</executions>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
- <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
<archive>
<manifest>
<mainClass>org.apache.openejb.test.Main</mainClass>
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml?rev=1153800&r1=1153799&r2=1153800&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
Thu Aug 4 09:13:23 2011
@@ -129,7 +129,9 @@
<id>bin</id>
<phase>package</phase>
<configuration>
- <descriptor>src/main/assembly/tomee.xml</descriptor>
+ <descriptors>
+ <descriptor>src/main/assembly/tomee.xml</descriptor>
+ </descriptors>
<appendAssemblyId>false</appendAssemblyId>
<finalName>apache-tomee-${project.version}</finalName>
</configuration>
Modified: openejb/trunk/openejb3/container/openejb-activemq4/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-activemq4/pom.xml?rev=1153800&r1=1153799&r2=1153800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-activemq4/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-activemq4/pom.xml Thu Aug 4
09:13:23 2011
@@ -81,16 +81,10 @@
<forkMode>pertest</forkMode>
<argLine>-Xmx256m
"-javaagent:${basedir}/target/openejb-javaagent-${project.version}.jar"
-enableassertions</argLine>
<workingDirectory>${basedir}/target</workingDirectory>
- <systemProperties>
- <property>
- <name>openejb.home</name>
- <value>${basedir}/target/test-classes</value>
- </property>
- <property>
- <name>log4j.configuration</name>
-
<value>file:///${basedir}/target/classes/embedded.logging.properties</value>
- </property>
- </systemProperties>
+ <systemPropertyVariables>
+ <openejb.home>${basedir}/target/test-classes</openejb.home>
+
<log4j.configuration>file:///${basedir}/target/classes/embedded.logging.properties</log4j.configuration>
+ </systemPropertyVariables>
<excludes>
<exclude>**/TestHandler.java</exclude>
</excludes>
@@ -106,7 +100,7 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<tstamp>
<format property="TSTAMP" pattern="hh:mm"/>
</tstamp>
@@ -119,7 +113,7 @@
<pathelement path="${compile_classpath}"/>
</classpath>
</java>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
Modified: openejb/trunk/openejb3/container/openejb-core/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/pom.xml?rev=1153800&r1=1153799&r2=1153800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/pom.xml Thu Aug 4 09:13:23
2011
@@ -151,7 +151,7 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<tstamp>
<format property="TSTAMP" pattern="hh:mm" />
</tstamp>
@@ -164,7 +164,7 @@
<pathelement path="${compile_classpath}" />
</classpath>
</java>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
@@ -449,16 +449,10 @@
<forkMode>pertest</forkMode>
<argLine>"-javaagent:${basedir}/target/openejb-javaagent-${project.version}.jar"
-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</argLine>
<workingDirectory>${basedir}/target</workingDirectory>
- <systemProperties>
- <property>
- <name>openejb.home</name>
- <value>${basedir}/target/test-classes</value>
- </property>
- <property>
- <name>log4j.configuration</name>
-
<value>file:///${basedir}/target/classes/embedded.logging.properties</value>
- </property>
- </systemProperties>
+ <systemPropertyVariables>
+ <openejb.home>${basedir}/target/test-classes</openejb.home>
+
<log4j.configuration>file:///${basedir}/target/classes/embedded.logging.properties</log4j.configuration>
+ </systemPropertyVariables>
</configuration>
</plugin>
</plugins>
Modified: openejb/trunk/openejb3/container/openejb-spring/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-spring/pom.xml?rev=1153800&r1=1153799&r2=1153800&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-spring/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-spring/pom.xml Thu Aug 4 09:13:23
2011
@@ -74,16 +74,10 @@
<forkMode>pertest</forkMode>
<argLine>"-javaagent:${basedir}/target/openejb-javaagent-${project.version}.jar"
-enableassertions</argLine>
<workingDirectory>${basedir}/target</workingDirectory>
- <systemProperties>
- <property>
- <name>openejb.home</name>
- <value>${basedir}/target/test-classes</value>
- </property>
- <property>
- <name>log4j.configuration</name>
-
<value>file:///${basedir}/target/test-classes/embedded.logging.properties</value>
- </property>
- </systemProperties>
+ <systemPropertyVariables>
+ <openejb.home>${basedir}/target/test-classes</openejb.home>
+
<log4j.configuration>file:///${basedir}/target/classes/embedded.logging.properties</log4j.configuration>
+ </systemPropertyVariables>
<excludes>
<exclude>**/TestHandler.java</exclude>
</excludes>
Modified: openejb/trunk/openejb3/examples/applicationexception/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/applicationexception/pom.xml?rev=1153800&r1=1153799&r2=1153800&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/applicationexception/pom.xml (original)
+++ openejb/trunk/openejb3/examples/applicationexception/pom.xml Thu Aug 4
09:13:23 2011
@@ -47,12 +47,9 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.6</version>
<configuration>
- <systemProperties>
- <property>
- <name>openejb.applicationexceptions.inherited</name>
- <value>true</value>
- </property>
- </systemProperties>
+ <systemPropertyVariables>
+
<openejb.applicationexceptions.inherited>true</openejb.applicationexceptions.inherited>
+ </systemPropertyVariables>
</configuration>
</plugin>
</plugins>
Modified: openejb/trunk/openejb3/examples/webservice-ws-security/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webservice-ws-security/pom.xml?rev=1153800&r1=1153799&r2=1153800&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webservice-ws-security/pom.xml (original)
+++ openejb/trunk/openejb3/examples/webservice-ws-security/pom.xml Thu Aug 4
09:13:23 2011
@@ -118,9 +118,9 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks name="generate keys">
+ <target name="generate keys">
<ant antfile="create-keystores.xml" target="run"/>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
Modified: openejb/trunk/openejb3/itests/openejb-itests-app/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-app/pom.xml?rev=1153800&r1=1153799&r2=1153800&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-app/pom.xml (original)
+++ openejb/trunk/openejb3/itests/openejb-itests-app/pom.xml Thu Aug 4
09:13:23 2011
@@ -45,11 +45,11 @@
</executions>
<configuration>
<modules>
- <javaModule>
+ <jarModule>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<bundleDir>META-INF/lib</bundleDir>
- </javaModule>
+ </jarModule>
<ejbModule>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-beans</artifactId>
@@ -58,11 +58,11 @@
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-interceptor-beans</artifactId>
</ejbModule>
- <javaModule>
+ <jarModule>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-itests-client</artifactId>
<includeInApplicationXml>true</includeInApplicationXml>
- </javaModule>
+ </jarModule>
</modules>
</configuration>
</plugin>
Modified: openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml?rev=1153800&r1=1153799&r2=1153800&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml (original)
+++ openejb/trunk/openejb3/itests/openejb-itests-client/pom.xml Thu Aug 4
09:13:23 2011
@@ -59,13 +59,13 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<tstamp>
<format property="TSTAMP" pattern="hh:mm" />
</tstamp>
<replace
file="target/classes/META-INF/openejb-version.properties"
token="@DATE-REPLACED-BY-MAVEN@" value="${DSTAMP}" />
<replace
file="target/classes/META-INF/openejb-version.properties"
token="@TIME-REPLACED-BY-MAVEN@" value="${TSTAMP}" />
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
Modified: openejb/trunk/openejb3/server/openejb-http/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-http/pom.xml?rev=1153800&r1=1153799&r2=1153800&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-http/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-http/pom.xml Thu Aug 4 09:13:23 2011
@@ -67,12 +67,9 @@
<!-- DEBUG: Uncomment this line and comment out the next -->
<!--<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
-javaagent:${project.build.directory}/target/openejb-javaagent-${version}.jar=foo=bar</argLine>-->
<argLine>"-javaagent:${project.build.directory}/openejb-javaagent-${project.version}.jar=foo=bar"</argLine>
- <systemProperties>
- <property>
- <name>openejb.home</name>
- <value>${project.build.directory}/test-classes</value>
- </property>
- </systemProperties>
+ <systemPropertyVariables>
+
<openejb.home>${project.build.directory}/test-classes</openejb.home>
+ </systemPropertyVariables>
<basedir>${project.build.directory}</basedir>
</configuration>
</plugin>
Modified: openejb/trunk/openejb3/server/openejb-webadmin/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-webadmin/pom.xml?rev=1153800&r1=1153799&r2=1153800&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-webadmin/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-webadmin/pom.xml Thu Aug 4 09:13:23
2011
@@ -61,12 +61,9 @@
<!-- DEBUG: Uncomment this line and comment out the next -->
<!--<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
-javaagent:${project.build.directory}/target/openejb-javaagent-${version}.jar=foo=bar</argLine>-->
<argLine>"-javaagent:${project.build.directory}/openejb-javaagent-${project.version}.jar=foo=bar"</argLine>
- <systemProperties>
- <property>
- <name>openejb.home</name>
- <value>${project.build.directory}/test-classes</value>
- </property>
- </systemProperties>
+ <systemPropertyVariables>
+
<openejb.home>${project.build.directory}/test-classes</openejb.home>
+ </systemPropertyVariables>
<basedir>${project.build.directory}</basedir>
</configuration>
</plugin>
Modified: openejb/trunk/openejb3/tck/cdi-embedded/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-embedded/pom.xml?rev=1153800&r1=1153799&r2=1153800&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/cdi-embedded/pom.xml (original)
+++ openejb/trunk/openejb3/tck/cdi-embedded/pom.xml Thu Aug 4 09:13:23 2011
@@ -74,36 +74,18 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
+ <configuration>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources/passing.xml</suiteXmlFile>
</suiteXmlFiles>
- <systemProperties>
- <!--<property>-->
- <!--<name>org.jboss.testharness.standalone</name>-->
- <!--<value>false</value>-->
- <!--</property>-->
- <!--<property>-->
- <!--<name>org.jboss.testharness.runIntegrationTests</name>-->
- <!--<value>true</value>-->
- <!--</property>-->
- <!--<property>-->
- <!--<name>org.jboss.testharness.container.forceRestart</name>-->
- <!--<value>true</value>-->
- <!--</property>-->
- <!--<property>-->
- <!--<name>org.jboss.testharness.libraryDirectory</name>-->
- <!--<value>${project.build.directory}/dependency/lib</value>-->
- <!--</property>-->
- <!--<property>-->
- <!--<name>org.jboss.testharness.outputDirectory</name>-->
- <!--<value>target</value>-->
- <!--</property>-->
- <!--<property>-->
- <!--<name>deleteArtifacts</name>-->
- <!--<value>true</value>-->
- <!--</property>-->
- </systemProperties>
+ <systemPropertyVariables>
+
<!--<org.jboss.testharness.standalone>false</org.jboss.testharness.standalone>-->
+
<!--<org.jboss.testharness.runIntegrationTests>true</org.jboss.testharness.runIntegrationTests>-->
+
<!--<org.jboss.testharness.container.forceRestart>true</org.jboss.testharness.container.forceRestart>-->
+
<!--<org.jboss.testharness.libraryDirectory>${project.build.directory}/dependency/lib</org.jboss.testharness.libraryDirectory>-->
+
<!--<org.jboss.testharness.outputDirectory>target</org.jboss.testharness.outputDirectory>-->
+ <!--<deleteArtifacts>true</deleteArtifacts>-->
+ </systemPropertyVariables>
</configuration>
</plugin>
</plugins>
Modified: openejb/trunk/openejb3/tck/cdi-tomee/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-tomee/pom.xml?rev=1153800&r1=1153799&r2=1153800&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/cdi-tomee/pom.xml (original)
+++ openejb/trunk/openejb3/tck/cdi-tomee/pom.xml Thu Aug 4 09:13:23 2011
@@ -169,33 +169,14 @@
<!--<suiteXmlFile>src/test/resources/failing.xml</suiteXmlFile>-->
</suiteXmlFiles>
<!--<forkMode>once</forkMode>-->
- <systemProperties>
- <property>
- <name>org.jboss.testharness.standalone</name>
- <value>false</value>
- </property>
- <property>
- <name>org.jboss.testharness.runIntegrationTests</name>
- <value>true</value>
- </property>
- <property>
- <name>org.jboss.testharness.container.forceRestart</name>
- <value>true</value>
- </property>
- <property>
- <name>org.jboss.testharness.libraryDirectory</name>
- <value>${project.build.directory}/dependency/lib</value>
- </property>
- <!--<property>-->
- <!--<name>org.jboss.testharness.outputDirectory</name>-->
- <!--<value>target</value>-->
- <!--</property>-->
- <property>
- <name>deleteArtifacts</name>
- <value>true</value>
- </property>
- </systemProperties>
<systemPropertyVariables>
+
<org.jboss.testharness.standalone>false</org.jboss.testharness.standalone>
+
<org.jboss.testharness.runIntegrationTests>true</org.jboss.testharness.runIntegrationTests>
+
<org.jboss.testharness.container.forceRestart>true</org.jboss.testharness.container.forceRestart>
+
<org.jboss.testharness.libraryDirectory>${project.build.directory}/dependency/lib</org.jboss.testharness.libraryDirectory>
+
<!--<org.jboss.testharness.outputDirectory>target</org.jboss.testharness.outputDirectory>-->
+ <deleteArtifacts>true</deleteArtifacts>
+
<!--<openejb.server.debug>true</openejb.server.debug>-->
<java.naming.provider.url>http://localhost:8180/openejb/ejb</java.naming.provider.url>
<connect.tries>90</connect.tries>
