tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgallim...@apache.org
Subject svn commit: r783896 - in /openejb/trunk/openejb-eclipse-plugin: ./ assembly/src/main/assembly/ common/src/main/java/org/apache/openejb/plugins/common/ common/src/test/java/org/apache/openejb/plugins/common/ plugins/org.apache.openejb.builder/META-INF/ ...
Date Thu, 11 Jun 2009 20:29:59 GMT
Author: jgallimore
Date: Thu Jun 11 20:29:59 2009
New Revision: 783896

URL: http://svn.apache.org/viewvc?rev=783896&view=rev
Log:
Updated deps to match OpenEJB 3.1.1 release

Modified:
    openejb/trunk/openejb-eclipse-plugin/assembly/src/main/assembly/deployable.xml
    openejb/trunk/openejb-eclipse-plugin/assembly/src/main/assembly/updatesite.xml
    openejb/trunk/openejb-eclipse-plugin/common/src/main/java/org/apache/openejb/plugins/common/OpenEjbXmlConverter.java
    openejb/trunk/openejb-eclipse-plugin/common/src/test/java/org/apache/openejb/plugins/common/TestFixture.java
    openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.builder/META-INF/MANIFEST.MF
    openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.devtools.core/META-INF/MANIFEST.MF
    openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.devtools.core/pom.xml
    openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.server/META-INF/MANIFEST.MF
    openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.server/pom.xml
    openejb/trunk/openejb-eclipse-plugin/pom.xml

Modified: openejb/trunk/openejb-eclipse-plugin/assembly/src/main/assembly/deployable.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb-eclipse-plugin/assembly/src/main/assembly/deployable.xml?rev=783896&r1=783895&r2=783896&view=diff
==============================================================================
--- openejb/trunk/openejb-eclipse-plugin/assembly/src/main/assembly/deployable.xml (original)
+++ openejb/trunk/openejb-eclipse-plugin/assembly/src/main/assembly/deployable.xml Thu Jun
11 20:29:59 2009
@@ -56,4 +56,14 @@
 			</includes>
 		</dependencySet>
 	</dependencySets>
+	<files>
+		<file>
+			<source>${basedir}/src/main/assembly/LICENSE.txt</source>
+			<outputDirectory>/</outputDirectory>
+		</file>
+		<file>
+			<source>${basedir}/src/main/assembly/NOTICE.txt</source>
+			<outputDirectory>/</outputDirectory>
+		</file>
+	</files>
 </assembly>
\ No newline at end of file

Modified: openejb/trunk/openejb-eclipse-plugin/assembly/src/main/assembly/updatesite.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb-eclipse-plugin/assembly/src/main/assembly/updatesite.xml?rev=783896&r1=783895&r2=783896&view=diff
==============================================================================
--- openejb/trunk/openejb-eclipse-plugin/assembly/src/main/assembly/updatesite.xml (original)
+++ openejb/trunk/openejb-eclipse-plugin/assembly/src/main/assembly/updatesite.xml Thu Jun
11 20:29:59 2009
@@ -62,5 +62,13 @@
 			<source>${basedir}/src/main/assembly/site.xml</source>
 			<outputDirectory>/</outputDirectory>
 		</file>
+		<file>
+			<source>${basedir}/src/main/assembly/LICENSE.txt</source>
+			<outputDirectory>/</outputDirectory>
+		</file>
+		<file>
+			<source>${basedir}/src/main/assembly/NOTICE.txt</source>
+			<outputDirectory>/</outputDirectory>
+		</file>
 	</files>
 </assembly>

Modified: openejb/trunk/openejb-eclipse-plugin/common/src/main/java/org/apache/openejb/plugins/common/OpenEjbXmlConverter.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb-eclipse-plugin/common/src/main/java/org/apache/openejb/plugins/common/OpenEjbXmlConverter.java?rev=783896&r1=783895&r2=783896&view=diff
==============================================================================
--- openejb/trunk/openejb-eclipse-plugin/common/src/main/java/org/apache/openejb/plugins/common/OpenEjbXmlConverter.java
(original)
+++ openejb/trunk/openejb-eclipse-plugin/common/src/main/java/org/apache/openejb/plugins/common/OpenEjbXmlConverter.java
Thu Jun 11 20:29:59 2009
@@ -18,6 +18,7 @@
 package org.apache.openejb.plugins.common;
 
 import java.util.HashMap;
+import java.util.HashSet;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
@@ -114,7 +115,7 @@
 
 			if (openEjbJarSrc != null) {
 		        InitEjbDeployments initEjbDeployments = new InitEjbDeployments();
-		        initEjbDeployments.deploy(ejbModule, new HashMap<String,String>());
+		        initEjbDeployments.deploy(ejbModule);
 
 		        JAXBElement<?> element = (JAXBElement<?>) JaxbOpenejbJar2.unmarshal(OpenejbJarType.class,
openEjbJarSrc.getByteStream());
 		        OpenejbJarType openejbJarType = (OpenejbJarType) element.getValue();

Modified: openejb/trunk/openejb-eclipse-plugin/common/src/test/java/org/apache/openejb/plugins/common/TestFixture.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb-eclipse-plugin/common/src/test/java/org/apache/openejb/plugins/common/TestFixture.java?rev=783896&r1=783895&r2=783896&view=diff
==============================================================================
--- openejb/trunk/openejb-eclipse-plugin/common/src/test/java/org/apache/openejb/plugins/common/TestFixture.java
(original)
+++ openejb/trunk/openejb-eclipse-plugin/common/src/test/java/org/apache/openejb/plugins/common/TestFixture.java
Thu Jun 11 20:29:59 2009
@@ -27,6 +27,7 @@
 import javax.xml.bind.JAXBElement;
 import java.io.InputStream;
 import java.util.HashMap;
+import java.util.HashSet;
 
 public class TestFixture {
 
@@ -67,7 +68,7 @@
 
 		if (openEjbJarSrc != null) {
 			InitEjbDeployments initEjbDeployments = new InitEjbDeployments();
-			initEjbDeployments.deploy(ejbModule, new HashMap<String, String>());
+			initEjbDeployments.deploy(ejbModule);
 
 			JAXBElement<?> element = (JAXBElement<?>) JaxbOpenejbJar2.unmarshal(OpenejbJarType.class,
openEjbJarSrc.getByteStream());
 			OpenejbJarType openejbJarType = (OpenejbJarType) element.getValue();

Modified: openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.builder/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.builder/META-INF/MANIFEST.MF?rev=783896&r1=783895&r2=783896&view=diff
==============================================================================
--- openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.builder/META-INF/MANIFEST.MF
(original)
+++ openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.builder/META-INF/MANIFEST.MF
Thu Jun 11 20:29:59 2009
@@ -24,7 +24,7 @@
 Eclipse-LazyStart: true
 Bundle-ClassPath: .,
  target/classes/,
- lib/ejb31-api-experimental-3.1.jar
+ lib/ejb31-api-experimental-3.1.1.jar
 Main-Class: org.apache.openejb.helper.annotation.cli.Main
 Export-Package: org.apache.openejb.helper.annotation
 Bundle-Vendor: %providerName

Modified: openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.devtools.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.devtools.core/META-INF/MANIFEST.MF?rev=783896&r1=783895&r2=783896&view=diff
==============================================================================
--- openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.devtools.core/META-INF/MANIFEST.MF
(original)
+++ openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.devtools.core/META-INF/MANIFEST.MF
Thu Jun 11 20:29:59 2009
@@ -22,15 +22,13 @@
 Provide-Package: org.apache.openejb.devtools.core,
  org.apache.openejb.plugins.common
 Bundle-ClassPath: .,
- lib/javaee-api-5.0-1.jar,
+ lib/openejb-jee-3.1.1.jar,
+ lib/openejb-api-3.1.1.jar,
+ lib/jaxb-impl-2.0.5.jar,
+ lib/openejb-loader-3.1.1.jar,
+ lib/log4j-1.2.12.jar,
+ lib/swizzle-stream-1.0.1.jar,
+ lib/openejb-core-3.1.1.jar,
+ lib/javaee-api-5.0-2.jar,
  lib/plugins-common-1.0.0.jar,
- lib/jaxb-api-2.0.jar, 
- lib/jaxb-impl-2.0.3.jar, 
- lib/log4j-1.2.12.jar, 
- lib/openejb-core-3.1.jar, 
- lib/openejb-jee-3.1.jar, 
- lib/openejb-loader-3.1.jar, 
- lib/swizzle-stream-1.0.1.jar, 
- lib/sxc-jaxb-0.7-SNAPSHOT.jar, 
- lib/sxc-runtime-0.7-SNAPSHOT.jar,
  target/classes/

Modified: openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.devtools.core/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.devtools.core/pom.xml?rev=783896&r1=783895&r2=783896&view=diff
==============================================================================
--- openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.devtools.core/pom.xml
(original)
+++ openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.devtools.core/pom.xml
Thu Jun 11 20:29:59 2009
@@ -98,23 +98,16 @@
 								</artifactItem>
 								<artifactItem>
 									<groupId>
-										com.envoisolutions.sxc
-									</groupId>
-									<artifactId>sxc-jaxb</artifactId>
-									<version>0.7-SNAPSHOT</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>
-										com.envoisolutions.sxc
+										org.apache.openejb
 									</groupId>
-									<artifactId>sxc-runtime</artifactId>
-									<version>0.7-SNAPSHOT</version>
+									<artifactId>openejb-jee</artifactId>
+									<version>${openejb.version}</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>
 										org.apache.openejb
 									</groupId>
-									<artifactId>openejb-jee</artifactId>
+									<artifactId>openejb-api</artifactId>
 									<version>${openejb.version}</version>
 								</artifactItem>
 								<artifactItem>
@@ -140,7 +133,7 @@
 										org.apache.openejb
 									</groupId>
 									<artifactId>javaee-api</artifactId>
-									<version>5.0-1</version>
+									<version>5.0-2</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>
@@ -152,14 +145,9 @@
 									<version>1.2.12</version>
 								</artifactItem>
 								<artifactItem>
-									<groupId>javax.xml.bind</groupId>
-									<artifactId>jaxb-api</artifactId>
-									<version>2.0</version>
-								</artifactItem>
-								<artifactItem>
 									<groupId>com.sun.xml.bind</groupId>
 									<artifactId>jaxb-impl</artifactId>
-									<version>2.0.3</version>
+									<version>2.0.5</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.codehaus.swizzle</groupId>
@@ -197,7 +185,7 @@
 		<dependency>
 			<groupId>org.apache.openejb</groupId>
 			<artifactId>javaee-api</artifactId>
-			<version>5.0-1</version>
+			<version>5.0-2</version>
 		</dependency>
 	</dependencies>
 </project>

Modified: openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.server/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.server/META-INF/MANIFEST.MF?rev=783896&r1=783895&r2=783896&view=diff
==============================================================================
--- openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.server/META-INF/MANIFEST.MF
(original)
+++ openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.server/META-INF/MANIFEST.MF
Thu Jun 11 20:29:59 2009
@@ -651,56 +651,60 @@
  serp.util
 Bundle-ClassPath: .,
   target/classes,
-  lib/activeio-core-3.0.0-incubator.jar,
-  lib/activemq-core-4.1.1.jar,
-  lib/activemq-ra-4.1.1.jar,
-  lib/asm-finder-3.1.jar,
-  lib/backport-util-concurrent-2.1.jar,
-  lib/commons-cli-1.1.jar,
-  lib/commons-collections-3.2.jar,
-  lib/commons-dbcp-all-1.3-r699049.jar,
-  lib/commons-lang-2.1.jar,
-  lib/commons-logging-1.1.jar,
-  lib/commons-logging-api-1.1.jar,
-  lib/commons-pool-1.3.jar,
-  lib/cxf-bundle-2.0.4-incubator.jar,
-  lib/ejb31-api-experimental-3.1.jar,
-  lib/geronimo-connector-2.1.jar,
-  lib/geronimo-javamail_1.4_mail-1.2.jar,
-  lib/geronimo-transaction-2.1.jar,
-  lib/howl-1.0.1-1.jar,
-  lib/hsqldb-1.8.0.7.jar,
-  lib/javaee-api-5.0-1.jar,
-  lib/jaxb-impl-2.0.5.jar,
-  lib/log4j-1.2.12.jar,
-  lib/neethi-2.0.2.jar,
-  lib/openejb-client-3.1.jar,
-  lib/openejb-core-3.1.jar,
-  lib/openejb-cxf-3.1.jar,
-  lib/openejb-ejbd-3.1.jar,
-  lib/openejb-hsql-3.1.jar,
-  lib/openejb-http-3.1.jar,
-  lib/openejb-javaagent-3.1.jar,
-  lib/openejb-jee-3.1.jar,
-  lib/openejb-loader-3.1.jar,
-  lib/openejb-multicast-3.1.jar,
-  lib/openejb-server-3.1.jar,
-  lib/openejb-telnet-3.1.jar,
-  lib/openejb-webservices-3.1.jar,
-  lib/openjpa-1.2.0.jar,
-  lib/quartz-1.5.2.jar,
-  lib/saaj-impl-1.3.jar,
-  lib/serp-1.13.1.jar,
-  lib/slf4j-api-1.3.1.jar,
-  lib/slf4j-jdk14-1.3.1.jar,
-  lib/stax-api-1.0.1.jar,
-  lib/swizzle-stream-1.0.1.jar,
-  lib/wsdl4j-1.6.1.jar,
-  lib/wstx-asl-3.2.0.jar,
-  lib/xbean-naming-3.4.1.jar,
-  lib/xbean-reflect-3.4.1.jar,
-  lib/xml-resolver-1.2.jar,
-  lib/XmlSchema-1.3.2.jar
+  lib/openejb-jee-3.1.1.jar,
+   lib/xbean-reflect-3.6-r779512.jar,
+   lib/openejb-server-3.1.1.jar,
+   lib/geronimo-transaction-2.1.jar,
+   lib/geronimo-javamail_1.4_mail-1.2.jar,
+   lib/activemq-ra-4.1.1.jar,
+   lib/commons-dbcp-all-1.3-r699049.jar,
+   lib/commons-lang-2.1.jar,
+   lib/activemq-core-4.1.1.jar,
+   lib/ejb31-api-experimental-3.1.1.jar,
+   lib/commons-pool-1.3.jar,
+   lib/cxf-bundle-2.0.9.jar,
+   lib/jaxb-impl-2.0.5.jar,
+   lib/neethi-2.0.4.jar,
+   lib/geronimo-connector-2.1.jar,
+   lib/openejb-loader-3.1.1.jar,
+   lib/wsdl4j-1.6.1.jar,
+   lib/commons-logging-1.1.jar,
+   lib/xbean-asm-shaded-3.6-r779512.jar,
+   lib/slf4j-api-1.3.1.jar,
+   lib/openejb-http-3.1.1.jar,
+   lib/openejb-cxf-3.1.1.jar,
+   lib/hsqldb-1.8.0.7.jar,
+   lib/bcprov-jdk15-140.jar,
+   lib/howl-1.0.1-1.jar,
+   lib/XmlSchema-1.3.2.jar,
+   lib/backport-util-concurrent-2.1.jar,
+   lib/openejb-telnet-3.1.1.jar,
+   lib/openjpa-1.2.0.jar,
+   lib/xml-resolver-1.2.jar,
+   lib/log4j-1.2.12.jar,
+   lib/commons-cli-1.1.jar,
+   lib/openejb-webservices-3.1.1.jar,
+   lib/openejb-hsql-3.1.1.jar,
+   lib/xbean-finder-shaded-3.6-r779512.jar,
+   lib/xbean-naming-3.5.jar,
+   lib/stax-api-1.0.1.jar,
+   lib/swizzle-stream-1.0.1.jar,
+   lib/openejb-ejbd-3.1.1.jar,
+   lib/commons-collections-3.2.jar,
+   lib/openejb-javaagent-3.1.1.jar,
+   lib/quartz-1.5.2.jar,
+   lib/wstx-asl-3.2.0.jar,
+   lib/saaj-impl-1.3.jar,
+   lib/openejb-core-3.1.1.jar,
+   lib/serp-1.13.1.jar,
+   lib/slf4j-jdk14-1.3.1.jar,
+   lib/openejb-client-3.1.1.jar,
+   lib/activeio-core-3.0.0-incubator.jar,
+   lib/javaee-api-5.0-2.jar,
+   lib/openejb-multicast-3.1.1.jar,
+   lib/xmlsec-1.4.0.jar,
+   lib/wss4j-1.5.4.jar,
+   lib/opensaml-1.1.jar
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.variables
 Bundle-Activator: org.apache.openejb.eclipse.OpenEjbPlugin

Modified: openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.server/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.server/pom.xml?rev=783896&r1=783895&r2=783896&view=diff
==============================================================================
--- openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.server/pom.xml (original)
+++ openejb/trunk/openejb-eclipse-plugin/plugins/org.apache.openejb.server/pom.xml Thu Jun
11 20:29:59 2009
@@ -188,26 +188,6 @@
 									<version>1.0.1-1</version>
 								</artifactItem>
 								<artifactItem>
-									<groupId>org.apache.xbean</groupId>
-									<artifactId>xbean-reflect</artifactId>
-									<version>3.4.1</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>commons-logging</groupId>
-									<artifactId>commons-logging-api</artifactId>
-									<version>1.1</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.apache.openejb</groupId>
-									<artifactId>asm-finder</artifactId>
-									<version>3.1</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.apache.xbean</groupId>
-									<artifactId>xbean-naming</artifactId>
-									<version>3.4.1</version>
-								</artifactItem>
-								<artifactItem>
 									<groupId>hsqldb</groupId>
 									<artifactId>hsqldb</artifactId>
 									<version>1.8.0.7</version>
@@ -240,7 +220,7 @@
 								<artifactItem>
 									<groupId>org.apache.openejb</groupId>
 									<artifactId>javaee-api</artifactId>
-									<version>5.0-1</version>
+									<version>5.0-2</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.apache.geronimo.javamail</groupId>
@@ -295,7 +275,7 @@
 								<artifactItem>
 									<groupId>org.apache.cxf</groupId>
 									<artifactId>cxf-bundle</artifactId>
-									<version>2.0.4-incubator</version>
+									<version>2.0.9</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.slf4j</groupId>
@@ -310,7 +290,7 @@
 								<artifactItem>
 									<groupId>org.apache.neethi</groupId>
 									<artifactId>neethi</artifactId>
-									<version>2.0.2</version>
+									<version>2.0.4</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.slf4j</groupId>
@@ -327,6 +307,61 @@
 									<artifactId>xml-resolver</artifactId>
 									<version>1.2</version>
 								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.xbean</groupId>
+									<artifactId>xbean-asm-shaded</artifactId>
+									<version>3.6-r779512</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.xbean</groupId>
+									<artifactId>xbean-finder-shaded</artifactId>
+									<version>3.6-r779512</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.xbean</groupId>
+									<artifactId>xbean-reflect</artifactId>
+									<version>3.6-r779512</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.xbean</groupId>
+									<artifactId>xbean-naming</artifactId>
+									<version>3.5</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>bouncycastle</groupId>
+									<artifactId>bcprov-jdk15</artifactId>
+									<version>140</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.santuario</groupId>
+									<artifactId>xmlsec</artifactId>
+									<version>1.4.0</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>opensaml</groupId>
+									<artifactId>opensaml</artifactId>
+									<version>1.1</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.santuario</groupId>
+									<artifactId>xmlsec</artifactId>
+									<version>1.4.0</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.slf4j</groupId>
+									<artifactId>slf4j-jdk14</artifactId>
+									<version>1.3.1</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.slf4j</groupId>
+									<artifactId>slf4j-api</artifactId>
+									<version>1.3.1</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.ws.security</groupId>
+									<artifactId>wss4j</artifactId>
+									<version>1.5.4</version>
+								</artifactItem>
 							</artifactItems>
 						</configuration>
 					</execution>

Modified: openejb/trunk/openejb-eclipse-plugin/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb-eclipse-plugin/pom.xml?rev=783896&r1=783895&r2=783896&view=diff
==============================================================================
--- openejb/trunk/openejb-eclipse-plugin/pom.xml (original)
+++ openejb/trunk/openejb-eclipse-plugin/pom.xml Thu Jun 11 20:29:59 2009
@@ -17,151 +17,164 @@
   -->
 <!-- $Rev: 577554 $ $Date: 2007-09-20 06:35:12 +0100 (Thu, 20 Sep 2007) $ -->
 <project>
-                        
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.openejb</groupId>
-    <artifactId>eclipse-plugins</artifactId>
-    <packaging>pom</packaging>
-    <name>${artifactId}</name>
-    <version>1.0.0</version>
-                        
-    <description>Eclipse Plugins for OpenEJB</description>
-                        
-    <organization>
-        <name>OpenEJB</name>
-        <url>http://openejb.apache.org/</url>
-    </organization>
-                        
-    <properties>
-        <eclipseInstall>${settings.localRepository}/eclipse</eclipseInstall>
-	<openejb.version>3.1</openejb.version>
-    </properties>
-	
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/openejb/trunk/sandbox/openejb-eclipse-plugin/</connection>
-    <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/openejb/trunk/sandbox/openejb-eclipse-plugin/</developerConnection>
-    <url>http://svn.apache.org/viewvc/openejb/trunk/sandbox/openejb-eclipse-plugin/</url>
-  </scm>
-                        
-    <build>
-        <defaultGoal>install</defaultGoal>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-antrun-plugin</artifactId>
-                    <dependencies>
-                        <dependency>
-                            <groupId>oro</groupId>
-                            <artifactId>oro</artifactId>
-                            <version>2.0.8</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>ant</groupId>
-                            <artifactId>ant-apache-oro</artifactId>
-                            <version>1.6.4</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>ant</groupId>
-                            <artifactId>ant-optional</artifactId>
-                            <version>1.5.3-1</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.geronimo.devtools</groupId>
-                    <artifactId>maven-eclipsepde-plugin</artifactId>
-                    <version>1.0</version>
-                    <configuration>
-                        <eclipseHome>${settings.localRepository}/eclipse/eclipse/</eclipseHome>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-		    <debug>true</debug>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-                        
-    <repositories>
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-        <repository>
-            <id>apache.incubator</id>
-            <name>Apache Incubator Repository</name>
-            <url>http://people.apache.org/repo/m2-incubating-repository/</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>false</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-        <repository>
-            <id>ow.repo</id>
-            <name>OW Repo</name>
-            <url>http://jass.objectweb.org/repository/m2</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>false</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-		
-        <repository>
-            <id>codehaus-snapshots</id>
-            <name>Codehaus Snapshots Repository</name>
-            <url>http://snapshots.repository.codehaus.org</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories>
-                        
-    <pluginRepositories>
-        <pluginRepository>
-            <id>apache.org</id>
-            <name>Maven Plugin Snapshots</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.apache.openejb</groupId>
+	<artifactId>eclipse-plugins</artifactId>
+	<packaging>pom</packaging>
+	<name>${artifactId}</name>
+	<version>1.0.0</version>
+
+	<description>Eclipse Plugins for OpenEJB</description>
+
+	<organization>
+		<name>OpenEJB</name>
+		<url>http://openejb.apache.org/</url>
+	</organization>
+
+	<properties>
+		<eclipseInstall>${settings.localRepository}/eclipse</eclipseInstall>
+		<openejb.version>3.1.1</openejb.version>
+	</properties>
+
+	<scm>
+		<connection>scm:svn:http://svn.apache.org/repos/asf/openejb/trunk/sandbox/openejb-eclipse-plugin/</connection>
+		<developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/openejb/trunk/sandbox/openejb-eclipse-plugin/</developerConnection>
+		<url>http://svn.apache.org/viewvc/openejb/trunk/sandbox/openejb-eclipse-plugin/</url>
+	</scm>
+
+	<build>
+		<defaultGoal>install</defaultGoal>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-antrun-plugin</artifactId>
+					<dependencies>
+						<dependency>
+							<groupId>oro</groupId>
+							<artifactId>oro</artifactId>
+							<version>2.0.8</version>
+						</dependency>
+						<dependency>
+							<groupId>ant</groupId>
+							<artifactId>ant-apache-oro</artifactId>
+							<version>1.6.4</version>
+						</dependency>
+						<dependency>
+							<groupId>ant</groupId>
+							<artifactId>ant-optional</artifactId>
+							<version>1.5.3-1</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.geronimo.devtools</groupId>
+					<artifactId>maven-eclipsepde-plugin</artifactId>
+					<version>1.0</version>
+					<configuration>
+						<eclipseHome>${settings.localRepository}/eclipse/eclipse/</eclipseHome>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+					<debug>true</debug>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<repositories>
+		<repository>
+			<id>apache-snapshots</id>
+			<name>Apache Snapshots Repository</name>
+			<url>http://people.apache.org/repo/m2-snapshot-repository</url>
+			<layout>default</layout>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>ignore</checksumPolicy>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>apache.incubator</id>
+			<name>Apache Incubator Repository</name>
+			<url>http://people.apache.org/repo/m2-incubating-repository/</url>
+			<layout>default</layout>
+			<snapshots>
+				<enabled>false</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>ignore</checksumPolicy>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>ow.repo</id>
+			<name>OW Repo</name>
+			<url>http://jass.objectweb.org/repository/m2</url>
+			<layout>default</layout>
+			<snapshots>
+				<enabled>false</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>ignore</checksumPolicy>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+
+		<repository>
+			<id>codehaus-snapshots</id>
+			<name>Codehaus Snapshots Repository</name>
+			<url>http://snapshots.repository.codehaus.org</url>
+			<layout>default</layout>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>ignore</checksumPolicy>
+			</snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>openejb-3rdparty-builds</id>
+			<name>3rd Party Build Repository</name>
+			<url>http://svn.apache.org/repos/asf/openejb/repo/</url>
+      <!--<url>file:///Users/dblevins/work/openejb-root/repo/</url>-->
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>apache.org</id>
+			<name>Maven Plugin Snapshots</name>
+			<url>http://people.apache.org/repo/m2-snapshot-repository</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
        <!-- <pluginRepository>
             <id>tlc</id>
             <name>TLC Repository</name>
@@ -173,74 +186,74 @@
                 <enabled>false</enabled>
             </snapshots>
         </pluginRepository>-->
-    </pluginRepositories>
-                        
-    <profiles>
-        <profile>
-            <id>windows</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <properties>
-                <eclipsePlatformFamily>win32</eclipsePlatformFamily>
-            </properties>
-        </profile>
-        <profile>
-            <id>linux-x86</id>
-            <activation>
-                <os>
-                    <name>Linux</name>
-		    <arch>i386</arch>
-                </os>
-            </activation>
-            <properties>
-                <eclipsePlatformFamily>linux</eclipsePlatformFamily>
-            </properties>
-        </profile>
-        <profile>
-            <id>linux-x86_64</id>
-            <activation>
-                <os>
-                    <name>Linux</name>
-		    <arch>amd64</arch>
-                </os>
-            </activation>
-            <properties>
-                <eclipsePlatformFamily>linux_x86_64</eclipsePlatformFamily>
-            </properties>
-        </profile>
-        <profile>
-            <id>mac</id>
-            <activation>
-                <os>
-                    <family>mac</family>
-                </os>
-            </activation>
-            <properties>
-                <eclipsePlatformFamily>macos</eclipsePlatformFamily>
-            </properties>
-        </profile>
-    </profiles>
-                        
-    <modules>
-    	<module>common</module>
-        <module>eclipse</module>
-        <module>plugins</module>
-	<module>features</module>
-	<module>pde-test</module>
-	<module>assembly</module>
-    </modules>
-          
-     <reporting>
-     <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>taglist-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
+	</pluginRepositories>
+
+	<profiles>
+		<profile>
+			<id>windows</id>
+			<activation>
+				<os>
+					<family>windows</family>
+				</os>
+			</activation>
+			<properties>
+				<eclipsePlatformFamily>win32</eclipsePlatformFamily>
+			</properties>
+		</profile>
+		<profile>
+			<id>linux-x86</id>
+			<activation>
+				<os>
+					<name>Linux</name>
+					<arch>i386</arch>
+				</os>
+			</activation>
+			<properties>
+				<eclipsePlatformFamily>linux</eclipsePlatformFamily>
+			</properties>
+		</profile>
+		<profile>
+			<id>linux-x86_64</id>
+			<activation>
+				<os>
+					<name>Linux</name>
+					<arch>amd64</arch>
+				</os>
+			</activation>
+			<properties>
+				<eclipsePlatformFamily>linux_x86_64</eclipsePlatformFamily>
+			</properties>
+		</profile>
+		<profile>
+			<id>mac</id>
+			<activation>
+				<os>
+					<family>mac</family>
+				</os>
+			</activation>
+			<properties>
+				<eclipsePlatformFamily>macos</eclipsePlatformFamily>
+			</properties>
+		</profile>
+	</profiles>
+
+	<modules>
+		<module>common</module>
+		<module>eclipse</module>
+		<module>plugins</module>
+		<module>features</module>
+		<module>pde-test</module>
+		<module>assembly</module>
+	</modules>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>taglist-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</reporting>
 
 
 </project>



Mime
View raw message