diff --git a/activemq-dotnet/pom.xml b/activemq-dotnet/pom.xml index cb027798bf..d4af88c8b8 100644 --- a/activemq-dotnet/pom.xml +++ b/activemq-dotnet/pom.xml @@ -1,145 +1,145 @@ - - - - incubator-activemq - activemq-parent - 4.0-SNAPSHOT - - - 4.0.0 - activemq-dotnet - dotnet-library - - - - target/dotnet-assembly - target/test-dotnet-assembly - src/main/csharp - src/test/csharp - - - - - - org.apache.maven.plugins - maven-csharp-lifecycle-plugin - 1.0.RC6-SNAPSHOT - true - - - - - maven-compiler-plugin - 2.0 - true - - - csharp - true - - - true - - 1591 - - - - **/*.cs - - - - - - - - - - compile - compile - - compile - - - - library - - - - - - - - testCompile - test-compile - - testCompile - - - - - library - - unit-tests.dll - - - - - - - - org.codehaus.plexus - plexus-compiler-csharp - 1.6-SNAPSHOT - - - - - - - org.apache.maven.plugins - maven-nunit-plugin - 1.0.RC6-SNAPSHOT - - - - - - org.apache.maven.plugins - maven-vstudio-plugin - 1.0.RC6-SNAPSHOT - - ${dotnet.home} - - **/*.aspx - **/*.resx - **/*.cs - - - - - - - - - - - - - nunit - nunit-console - 2.2 - dotnet-exe - test - - - - + + + + incubator-activemq + activemq-parent + 4.0-SNAPSHOT + + + 4.0.0 + activemq-dotnet + dotnet-library + + + + target/dotnet-assembly + target/test-dotnet-assembly + src/main/csharp + src/test/csharp + + + + + + org.apache.maven.plugins + maven-csharp-lifecycle-plugin + 1.0.RC6-SNAPSHOT + true + + + + + maven-compiler-plugin + 2.0 + true + + + csharp + true + + + true + + 1591 + + + + **/*.cs + + + + + + + + + + compile + compile + + compile + + + + library + + + + + + + + testCompile + test-compile + + testCompile + + + + + library + + unit-tests.dll + + + + + + + + org.codehaus.plexus + plexus-compiler-csharp + 1.6-SNAPSHOT + + + + + + + org.apache.maven.plugins + maven-nunit-plugin + 1.0.RC6-SNAPSHOT + + + + + + org.apache.maven.plugins + maven-vstudio-plugin + 1.0.RC6-SNAPSHOT + + ${dotnet.home} + + **/*.aspx + **/*.resx + **/*.cs + + + + + + + + + + + + + nunit + nunit-console + 2.2 + dotnet-exe + test + + + + diff --git a/activemq-rar/pom.xml b/activemq-rar/pom.xml index 4446d4cc50..e1eb430ba1 100644 --- a/activemq-rar/pom.xml +++ b/activemq-rar/pom.xml @@ -1,201 +1,201 @@ - - - - - - - 4.0.0 - - - incubator-activemq - activemq-parent - 4.0-SNAPSHOT - ../pom.xml - - - activemq-rar - rar - ActiveMQ :: RAR - A JCA Resource Adapter used to integrate ActiveMQ with transactional enterprise containers - - - - - - ${pom.groupId} - activemq-ra - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - - - org.apache.geronimo.specs - geronimo-j2ee-connector_1.5_spec - - - org.apache.geronimo.specs - geronimo-ejb_2.1_spec - - - org.apache.geronimo.specs - geronimo-j2ee-jacc_1.0_spec - - - org.apache.geronimo.specs - geronimo-jta_1.0.1B_spec - - - org.apache.geronimo.specs - geronimo-servlet_2.4_spec - - - org.apache.geronimo.specs - geronimo-j2ee-management_1.0_spec - - - mx4j - mx4j - - - geronimo - geronimo-kernel - - - geronimo - geronimo-j2ee - - - axion - axion - - - ${pom.groupId} - activemq-jaas - - - howl - howl-logger - - - activemq - smackx - - - activemq - smack - - - mx4j - mx4j-jmx - - - mx4j - mx4j-impl - - - mx4j - mx4j-remote - - - mx4j - mx4j-tools - - - qdox - qdox - - - stax - stax-api - - - stax - stax - - - log4j - log4j - - - junit - junit - - - regexp - regexp - - - activemq - jmdns - - - xalan - xalan - - - xmlbeans - xbean - - - xmlbeans - xmlpublic - - - xmlbeans - xbean_xpath - - - xerces - xercesImpl - - - xml-apis - xml-apis - - - ant - ant - - - commons-collections - commons-collections - - - commons-primitives - commons-primitives - - - commons-pool - commons-pool - - - - - org.apache.xbean - xbean-spring - - - org.apache.derby - derby - - - - + + + + + + + 4.0.0 + + + incubator-activemq + activemq-parent + 4.0-SNAPSHOT + ../pom.xml + + + activemq-rar + rar + ActiveMQ :: RAR + A JCA Resource Adapter used to integrate ActiveMQ with transactional enterprise containers + + + + + + ${pom.groupId} + activemq-ra + + + org.apache.geronimo.specs + geronimo-jms_1.1_spec + + + org.apache.geronimo.specs + geronimo-j2ee-connector_1.5_spec + + + org.apache.geronimo.specs + geronimo-ejb_2.1_spec + + + org.apache.geronimo.specs + geronimo-j2ee-jacc_1.0_spec + + + org.apache.geronimo.specs + geronimo-jta_1.0.1B_spec + + + org.apache.geronimo.specs + geronimo-servlet_2.4_spec + + + org.apache.geronimo.specs + geronimo-j2ee-management_1.0_spec + + + mx4j + mx4j + + + geronimo + geronimo-kernel + + + geronimo + geronimo-j2ee + + + axion + axion + + + ${pom.groupId} + activemq-jaas + + + howl + howl-logger + + + activemq + smackx + + + activemq + smack + + + mx4j + mx4j-jmx + + + mx4j + mx4j-impl + + + mx4j + mx4j-remote + + + mx4j + mx4j-tools + + + qdox + qdox + + + stax + stax-api + + + stax + stax + + + log4j + log4j + + + junit + junit + + + regexp + regexp + + + activemq + jmdns + + + xalan + xalan + + + xmlbeans + xbean + + + xmlbeans + xmlpublic + + + xmlbeans + xbean_xpath + + + xerces + xercesImpl + + + xml-apis + xml-apis + + + ant + ant + + + commons-collections + commons-collections + + + commons-primitives + commons-primitives + + + commons-pool + commons-pool + + + + + org.apache.xbean + xbean-spring + + + org.apache.derby + derby + + + + diff --git a/activemq-rar/src/main/rar/META-INF/ra.xml b/activemq-rar/src/main/rar/META-INF/ra.xml index b36354e99a..ca1e273698 100644 --- a/activemq-rar/src/main/rar/META-INF/ra.xml +++ b/activemq-rar/src/main/rar/META-INF/ra.xml @@ -1,167 +1,167 @@ - - - - - ActiveMQ inbound and outbound JMS ResourceAdapter - ActiveMQ JMS Resource Adapter - activemq.org - JMS 1.1 - 1.0 - - - - Copyright 2005-2006 The Apache Software Foundation - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - true - - - org.apache.activemq.ra.ActiveMQResourceAdapter - - - The URL to the ActiveMQ server that you want this connection to connect to. If using - an embedded broker, this value should be 'vm://localhost'. - - ServerUrl - java.lang.String - tcp://localhost:61616 - - - - The default user name that will be used to establish connections to the ActiveMQ server. - UserName - java.lang.String - defaultUser - - - The default password that will be used to log the default user into the ActiveMQ server. - Password - java.lang.String - defaultPassword - - - The client id that will be set on the connection that is established to the ActiveMQ server. - Clientid - java.lang.String - - - Boolean to configure if outbound connections should reuse the inbound connection's session for sending messages. - UseInboundSession - java.lang.Boolean - false - - - - - - Sets the XML configuration file used to configure the embedded ActiveMQ broker via - Spring if using embedded mode. - - BrokerXmlConfig is the filename which is assumed to be on the classpath unless - a URL is specified. So a value of foo/bar.xml would be assumed to be on the - classpath whereas file:dir/file.xml would use the file system. - Any valid URL string is supported. - - BrokerXmlConfig - java.lang.String - - - - - - - org.apache.activemq.ra.ActiveMQManagedConnectionFactory - javax.jms.ConnectionFactory - org.apache.activemq.ra.ActiveMQConnectionFactory - javax.jms.Connection - org.apache.activemq.ra.ManagedConnectionProxy - - - org.apache.activemq.ra.ActiveMQManagedConnectionFactory - javax.jms.QueueConnectionFactory - org.apache.activemq.ra.ActiveMQConnectionFactory - javax.jms.QueueConnection - org.apache.activemq.ra.ManagedConnectionProxy - - - org.apache.activemq.ra.ActiveMQManagedConnectionFactory - javax.jms.TopicConnectionFactory - org.apache.activemq.ra.ActiveMQConnectionFactory - javax.jms.TopicConnection - org.apache.activemq.ra.ManagedConnectionProxy - - XATransaction - - BasicPassword - javax.resource.spi.security.PasswordCredential - - false - - - - - javax.jms.MessageListener - - org.apache.activemq.ra.ActiveMQActivationSpec - - - destination - - - destinationType - - - - - - - - javax.jms.Queue - org.apache.activemq.command.ActiveMQQueue - - PhysicalName - java.lang.String - - - - javax.jms.Topic - org.apache.activemq.command.ActiveMQTopic - - PhysicalName - java.lang.String - - - - + + + + + ActiveMQ inbound and outbound JMS ResourceAdapter + ActiveMQ JMS Resource Adapter + activemq.org + JMS 1.1 + 1.0 + + + + Copyright 2005-2006 The Apache Software Foundation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + true + + + org.apache.activemq.ra.ActiveMQResourceAdapter + + + The URL to the ActiveMQ server that you want this connection to connect to. If using + an embedded broker, this value should be 'vm://localhost'. + + ServerUrl + java.lang.String + tcp://localhost:61616 + + + + The default user name that will be used to establish connections to the ActiveMQ server. + UserName + java.lang.String + defaultUser + + + The default password that will be used to log the default user into the ActiveMQ server. + Password + java.lang.String + defaultPassword + + + The client id that will be set on the connection that is established to the ActiveMQ server. + Clientid + java.lang.String + + + Boolean to configure if outbound connections should reuse the inbound connection's session for sending messages. + UseInboundSession + java.lang.Boolean + false + + + + + + Sets the XML configuration file used to configure the embedded ActiveMQ broker via + Spring if using embedded mode. + + BrokerXmlConfig is the filename which is assumed to be on the classpath unless + a URL is specified. So a value of foo/bar.xml would be assumed to be on the + classpath whereas file:dir/file.xml would use the file system. + Any valid URL string is supported. + + BrokerXmlConfig + java.lang.String + + + + + + + org.apache.activemq.ra.ActiveMQManagedConnectionFactory + javax.jms.ConnectionFactory + org.apache.activemq.ra.ActiveMQConnectionFactory + javax.jms.Connection + org.apache.activemq.ra.ManagedConnectionProxy + + + org.apache.activemq.ra.ActiveMQManagedConnectionFactory + javax.jms.QueueConnectionFactory + org.apache.activemq.ra.ActiveMQConnectionFactory + javax.jms.QueueConnection + org.apache.activemq.ra.ManagedConnectionProxy + + + org.apache.activemq.ra.ActiveMQManagedConnectionFactory + javax.jms.TopicConnectionFactory + org.apache.activemq.ra.ActiveMQConnectionFactory + javax.jms.TopicConnection + org.apache.activemq.ra.ManagedConnectionProxy + + XATransaction + + BasicPassword + javax.resource.spi.security.PasswordCredential + + false + + + + + javax.jms.MessageListener + + org.apache.activemq.ra.ActiveMQActivationSpec + + + destination + + + destinationType + + + + + + + + javax.jms.Queue + org.apache.activemq.command.ActiveMQQueue + + PhysicalName + java.lang.String + + + + javax.jms.Topic + org.apache.activemq.command.ActiveMQTopic + + PhysicalName + java.lang.String + + + + diff --git a/activemq-rar/src/main/rar/broker-config.xml b/activemq-rar/src/main/rar/broker-config.xml index 07604fa2ff..92b367df78 100644 --- a/activemq-rar/src/main/rar/broker-config.xml +++ b/activemq-rar/src/main/rar/broker-config.xml @@ -1,63 +1,63 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/activemq-soaktest/maven.xml b/activemq-soaktest/maven.xml index b1635120b6..aa9a63b059 100644 --- a/activemq-soaktest/maven.xml +++ b/activemq-soaktest/maven.xml @@ -1,31 +1,31 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/activemq-soaktest/project.xml b/activemq-soaktest/project.xml index a5d45ac199..a9cb34d626 100644 --- a/activemq-soaktest/project.xml +++ b/activemq-soaktest/project.xml @@ -1,117 +1,117 @@ - - - - - 3 - ${basedir}/../etc/project.xml - ActiveMQ :: SoakTest - activemq - ActiveMQ Assembly - ActiveMQ Assembly creates an ActiveMQ distribution - - - - - - - - ${pom.groupId} - activemq-core - ${pom.currentVersion} - - true - true - - - - - ${pom.groupId} - activeio-core - ${activeio_version} - - true - true - - - - - ${pom.groupId} - activemq-core-test - ${pom.currentVersion} - - - - - - - org.apache.derby - derby - ${derby_version} - - true - true - - - - org.apache.derby - derbynet - ${derbynet_version} - - - - - - - - dev@activemq.codehaus.org - src/main/java - src/test/java - - - - - - - - src/test/resources - - **/*.properties - **/*.xml - - - - - **/*Test.* - - - - - - - - - - src/main/resources - - **/* - - - - - - - + + + + + 3 + ${basedir}/../etc/project.xml + ActiveMQ :: SoakTest + activemq + ActiveMQ Assembly + ActiveMQ Assembly creates an ActiveMQ distribution + + + + + + + + ${pom.groupId} + activemq-core + ${pom.currentVersion} + + true + true + + + + + ${pom.groupId} + activeio-core + ${activeio_version} + + true + true + + + + + ${pom.groupId} + activemq-core-test + ${pom.currentVersion} + + + + + + + org.apache.derby + derby + ${derby_version} + + true + true + + + + org.apache.derby + derbynet + ${derbynet_version} + + + + + + + + dev@activemq.codehaus.org + src/main/java + src/test/java + + + + + + + + src/test/resources + + **/*.properties + **/*.xml + + + + + **/*Test.* + + + + + + + + + + src/main/resources + + **/* + + + + + + + diff --git a/maven-bundle-plugin/pom.xml b/maven-bundle-plugin/pom.xml index dc8a7559bc..c9adedca8e 100644 --- a/maven-bundle-plugin/pom.xml +++ b/maven-bundle-plugin/pom.xml @@ -1,69 +1,69 @@ - - - - - - - 4.0.0 - - - incubator-activemq - activemq-parent - 4.0-SNAPSHOT - ../pom.xml - - - maven-bundle-plugin - maven-plugin - Bundle Plugin - - - - org.apache.maven - maven-project - 2.0 - - - org.codehaus.plexus - plexus-archiver - 1.0-alpha-5 - - - org.apache.maven - maven-archiver - 2.0 - - - org.apache.maven - maven-plugin-api - 2.0 - - - org.codehaus.plexus - plexus-utils - 1.1 - - - org.apache.maven - maven-artifact - 2.0 - - - + + + + + + + 4.0.0 + + + incubator-activemq + activemq-parent + 4.0-SNAPSHOT + ../pom.xml + + + maven-bundle-plugin + maven-plugin + Bundle Plugin + + + + org.apache.maven + maven-project + 2.0 + + + org.codehaus.plexus + plexus-archiver + 1.0-alpha-5 + + + org.apache.maven + maven-archiver + 2.0 + + + org.apache.maven + maven-plugin-api + 2.0 + + + org.codehaus.plexus + plexus-utils + 1.1 + + + org.apache.maven + maven-artifact + 2.0 + + + diff --git a/project.xml b/project.xml index b13f7ccc38..9551c94fae 100755 --- a/project.xml +++ b/project.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + ActiveMQ diff --git a/systest/itests/client/maven.xml b/systest/itests/client/maven.xml index 0e014f5482..5b5c7b5e22 100755 --- a/systest/itests/client/maven.xml +++ b/systest/itests/client/maven.xml @@ -1,6 +1,6 @@ - + - + - + - - - - - - - - + + + + + + + + + diff --git a/systest/weblogic-test/ActiveMQRAR/connectorModule/META-INF/weblogic-ra.xml b/systest/weblogic-test/ActiveMQRAR/connectorModule/META-INF/weblogic-ra.xml index bafc42c812..dd41ededed 100644 --- a/systest/weblogic-test/ActiveMQRAR/connectorModule/META-INF/weblogic-ra.xml +++ b/systest/weblogic-test/ActiveMQRAR/connectorModule/META-INF/weblogic-ra.xml @@ -1,48 +1,48 @@ - - - - - - activemq/ResourceAdapter - - - - - javax.jms.ConnectionFactory - - - activemq/ConnectionFactory - - - - - ConnectionURL - - jdbc:pointbase:server://localhost/demo - - - - - - - - - - + + + + + + activemq/ResourceAdapter + + + + + javax.jms.ConnectionFactory + + + activemq/ConnectionFactory + + + + + ConnectionURL + + jdbc:pointbase:server://localhost/demo + + + + + + + + + + diff --git a/systest/weblogic-test/ExampleEAR/.settings/org.eclipse.wst.common.project.facet.core.xml b/systest/weblogic-test/ExampleEAR/.settings/org.eclipse.wst.common.project.facet.core.xml index 9e28a08e26..2dfb8d05d0 100644 --- a/systest/weblogic-test/ExampleEAR/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/systest/weblogic-test/ExampleEAR/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/systest/weblogic-test/ExampleEAR/EarContent/META-INF/application.xml b/systest/weblogic-test/ExampleEAR/EarContent/META-INF/application.xml index a407a71db0..d94ce22481 100644 --- a/systest/weblogic-test/ExampleEAR/EarContent/META-INF/application.xml +++ b/systest/weblogic-test/ExampleEAR/EarContent/META-INF/application.xml @@ -1,17 +1,17 @@ - - - ExampleEAR - - ExampleEJB.jar - - - ActiveMQRAR.rar - - - - ExampleWAR.war - ExampleWAR - - - - + + + ExampleEAR + + ExampleEJB.jar + + + ActiveMQRAR.rar + + + + ExampleWAR.war + ExampleWAR + + + + diff --git a/systest/weblogic-test/ExampleEAR/EarContent/META-INF/weblogic-application.xml b/systest/weblogic-test/ExampleEAR/EarContent/META-INF/weblogic-application.xml index 13a6ad1730..a113bfa411 100644 --- a/systest/weblogic-test/ExampleEAR/EarContent/META-INF/weblogic-application.xml +++ b/systest/weblogic-test/ExampleEAR/EarContent/META-INF/weblogic-application.xml @@ -1,12 +1,12 @@ - - - - webapp.encoding.default - UTF-8 - - - beehive-controls-1.0 - 1.0 - 1.0 - + + + + webapp.encoding.default + UTF-8 + + + beehive-controls-1.0 + 1.0 + 1.0 + \ No newline at end of file diff --git a/systest/weblogic-test/ExampleEJB/.settings/org.eclipse.wst.common.project.facet.core.xml b/systest/weblogic-test/ExampleEJB/.settings/org.eclipse.wst.common.project.facet.core.xml index 9db772be74..8de99c262a 100644 --- a/systest/weblogic-test/ExampleEJB/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/systest/weblogic-test/ExampleEJB/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,10 +1,10 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/systest/weblogic-test/ExampleEJBClient/.settings/org.eclipse.wst.common.project.facet.core.xml b/systest/weblogic-test/ExampleEJBClient/.settings/org.eclipse.wst.common.project.facet.core.xml index d199385853..a3bd55ab5d 100644 --- a/systest/weblogic-test/ExampleEJBClient/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/systest/weblogic-test/ExampleEJBClient/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,10 +1,10 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/systest/weblogic-test/ExampleWAR/.settings/org.eclipse.wst.common.project.facet.core.xml b/systest/weblogic-test/ExampleWAR/.settings/org.eclipse.wst.common.project.facet.core.xml index accba9e111..8037d8c912 100644 --- a/systest/weblogic-test/ExampleWAR/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/systest/weblogic-test/ExampleWAR/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,8 @@ - - - - - - - - + + + + + + + + diff --git a/systest/weblogic-test/ExampleWAR/WebContent/WEB-INF/web.xml b/systest/weblogic-test/ExampleWAR/WebContent/WEB-INF/web.xml index 7b81e0aeba..d76c0a254a 100644 --- a/systest/weblogic-test/ExampleWAR/WebContent/WEB-INF/web.xml +++ b/systest/weblogic-test/ExampleWAR/WebContent/WEB-INF/web.xml @@ -1,28 +1,28 @@ - - - - - ExampleWAR - - index.html - index.htm - index.jsp - default.html - default.htm - default.jsp - - + + + + + ExampleWAR + + index.html + index.htm + index.jsp + default.html + default.htm + default.jsp + +