You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by db...@apache.org on 2006/09/13 01:16:49 UTC
svn commit: r442756 - in /geronimo/specs:
branches/jee5_exp/geronimo-jta_1.1_spec/
branches/jee5_exp/geronimo-spec-annotation/
branches/jee5_exp/geronimo-spec-ejb/
branches/jee5_exp/geronimo-spec-interceptor/
branches/jee5_exp/geronimo-spec-jpa/ trunk/...
Author: dblevins
Date: Tue Sep 12 16:16:48 2006
New Revision: 442756
URL: http://svn.apache.org/viewvc?view=rev&rev=442756
Log:
GERONIMO-2358 Move java ee 5 specs into specs trunk
Added:
geronimo/specs/trunk/geronimo-annotation_1.0_spec/
- copied from r437822, geronimo/specs/branches/jee5_exp/geronimo-spec-annotation/
geronimo/specs/trunk/geronimo-ejb_3.0_spec/
- copied from r437822, geronimo/specs/branches/jee5_exp/geronimo-spec-ejb/
geronimo/specs/trunk/geronimo-interceptor_3.0_spec/
- copied from r437822, geronimo/specs/branches/jee5_exp/geronimo-spec-interceptor/
geronimo/specs/trunk/geronimo-jpa_3.0_spec/
- copied from r437822, geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/
geronimo/specs/trunk/geronimo-jta_1.1_spec/
- copied from r437822, geronimo/specs/branches/jee5_exp/geronimo-jta_1.1_spec/
Removed:
geronimo/specs/branches/jee5_exp/geronimo-jta_1.1_spec/
geronimo/specs/branches/jee5_exp/geronimo-spec-annotation/
geronimo/specs/branches/jee5_exp/geronimo-spec-ejb/
geronimo/specs/branches/jee5_exp/geronimo-spec-interceptor/
geronimo/specs/branches/jee5_exp/geronimo-spec-jpa/
Modified:
geronimo/specs/trunk/geronimo-annotation_1.0_spec/pom.xml
geronimo/specs/trunk/geronimo-ejb_2.1_spec/pom.xml
geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml
geronimo/specs/trunk/geronimo-ejb_3.0_spec/src/main/java/javax/ejb/EJBContext.java
geronimo/specs/trunk/geronimo-ejb_3.0_spec/src/main/java/javax/ejb/SessionContext.java
geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml
geronimo/specs/trunk/geronimo-jpa_3.0_spec/pom.xml
geronimo/specs/trunk/geronimo-jta_1.0.1B_spec/pom.xml
geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml
geronimo/specs/trunk/geronimo-jta_1.1_spec/src/main/java/javax/transaction/TransactionSynchronizationRegistry.java
Modified: geronimo/specs/trunk/geronimo-annotation_1.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-annotation_1.0_spec/pom.xml?view=diff&rev=442756&r1=437822&r2=442756
==============================================================================
--- geronimo/specs/trunk/geronimo-annotation_1.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-annotation_1.0_spec/pom.xml Tue Sep 12 16:16:48 2006
@@ -1,20 +1,58 @@
-<project>
- <parent>
- <artifactId>jee5_exp_specs</artifactId>
- <groupId>org.apache.geronimo.specs</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <name>Annotation</name>
- <version>${geronimoSpecsAnnotationVersion}</version>
-
+<?xml version="1.0" encoding="UTF-8"?>
<!--
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- </dependency>
- </dependencies>
+ Copyright 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.
-->
+
+<!-- $Rev: 437256 $ $Date: 2006-08-26 17:17:49 -0700 (Sat, 26 Aug 2006) $ -->
+
+<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>org.apache.geronimo.specs</groupId>
+ <artifactId>specs</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <name>Annotation 1.0</name>
+ <version>${geronimoSpecsAnnotationVersion}</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <configuration>
+ <jdkName>1.5</jdkName>
+ <linkModules>true</linkModules>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-ejb_2.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_2.1_spec/pom.xml?view=diff&rev=442756&r1=442755&r2=442756
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_2.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-ejb_2.1_spec/pom.xml Tue Sep 12 16:16:48 2006
@@ -30,7 +30,7 @@
<artifactId>geronimo-ejb_2.1_spec</artifactId>
<name>EJB 2.1</name>
- <version>${geronimoSpecsEjbVersion}</version>
+ <version>${geronimoSpecsEjb21Version}</version>
<dependencies>
Modified: geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml?view=diff&rev=442756&r1=437822&r2=442756
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-ejb_3.0_spec/pom.xml Tue Sep 12 16:16:48 2006
@@ -1,26 +1,73 @@
-<project>
- <parent>
- <artifactId>jee5_exp_specs</artifactId>
- <groupId>org.apache.geronimo.specs</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <name>EJB</name>
- <version>${geronimoSpecsEjbVersion}</version>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_3.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- </dependency>
- </dependencies>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 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.
+-->
+
+<!-- $Rev: 437256 $ $Date$ -->
+
+<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>org.apache.geronimo.specs</groupId>
+ <artifactId>specs</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
+ <name>EJB 3.0</name>
+ <version>${geronimoSpecsEjb3Version}</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-interceptor_3.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <configuration>
+ <jdkName>1.5</jdkName>
+ <linkModules>true</linkModules>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-ejb_3.0_spec/src/main/java/javax/ejb/EJBContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.0_spec/src/main/java/javax/ejb/EJBContext.java?view=diff&rev=442756&r1=437822&r2=442756
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.0_spec/src/main/java/javax/ejb/EJBContext.java (original)
+++ geronimo/specs/trunk/geronimo-ejb_3.0_spec/src/main/java/javax/ejb/EJBContext.java Tue Sep 12 16:16:48 2006
@@ -32,7 +32,7 @@
*
*
*
- * @version $Rev: 46019 $ $Date: 2004-09-14 02:56:06 -0700 (Tue, 14 Sep 2004) $
+ * @version $Rev$ $Date$
*/
public interface EJBContext {
EJBHome getEJBHome();
Modified: geronimo/specs/trunk/geronimo-ejb_3.0_spec/src/main/java/javax/ejb/SessionContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-ejb_3.0_spec/src/main/java/javax/ejb/SessionContext.java?view=diff&rev=442756&r1=437822&r2=442756
==============================================================================
--- geronimo/specs/trunk/geronimo-ejb_3.0_spec/src/main/java/javax/ejb/SessionContext.java (original)
+++ geronimo/specs/trunk/geronimo-ejb_3.0_spec/src/main/java/javax/ejb/SessionContext.java Tue Sep 12 16:16:48 2006
@@ -29,7 +29,7 @@
*
*
*
- * @version $Rev: 46019 $ $Date: 2004-09-14 02:56:06 -0700 (Tue, 14 Sep 2004) $
+ * @version $Rev$ $Date$
*/
public interface SessionContext extends EJBContext {
EJBLocalObject getEJBLocalObject() throws IllegalStateException;
Modified: geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml?view=diff&rev=442756&r1=437822&r2=442756
==============================================================================
--- geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-interceptor_3.0_spec/pom.xml Tue Sep 12 16:16:48 2006
@@ -1,20 +1,58 @@
-<project>
- <parent>
- <artifactId>jee5_exp_specs</artifactId>
- <groupId>org.apache.geronimo.specs</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>geronimo-interceptor_3.0_spec</artifactId>
- <name>Interceptor</name>
- <version>${geronimoSpecsInterceptorVersion}</version>
-
+<?xml version="1.0" encoding="UTF-8"?>
<!--
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- </dependency>
- </dependencies>
+ Copyright 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.
-->
+
+<!-- $Rev: 437256 $ $Date: 2006-08-26 17:17:49 -0700 (Sat, 26 Aug 2006) $ -->
+
+<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>org.apache.geronimo.specs</groupId>
+ <artifactId>specs</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>geronimo-interceptor_3.0_spec</artifactId>
+ <name>Interceptor 3.0</name>
+ <version>${geronimoSpecsInterceptorVersion}</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <configuration>
+ <jdkName>1.5</jdkName>
+ <linkModules>true</linkModules>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-jpa_3.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_3.0_spec/pom.xml?view=diff&rev=442756&r1=437822&r2=442756
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_3.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jpa_3.0_spec/pom.xml Tue Sep 12 16:16:48 2006
@@ -1,20 +1,58 @@
-<project>
- <parent>
- <artifactId>jee5_exp_specs</artifactId>
- <groupId>org.apache.geronimo.specs</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
- <name>JPA</name>
- <version>${geronimoSpecsJpaVersion}</version>
-
- <!--
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- </dependency>
- </dependencies>
- -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 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.
+-->
+
+<!-- $Rev: 437256 $ $Date: 2006-08-26 17:17:49 -0700 (Sat, 26 Aug 2006) $ -->
+
+<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>org.apache.geronimo.specs</groupId>
+ <artifactId>specs</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <name>JPA 1.0</name>
+ <version>${geronimoSpecsJpaVersion}</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <configuration>
+ <jdkName>1.5</jdkName>
+ <linkModules>true</linkModules>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/specs/trunk/geronimo-jta_1.0.1B_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jta_1.0.1B_spec/pom.xml?view=diff&rev=442756&r1=442755&r2=442756
==============================================================================
--- geronimo/specs/trunk/geronimo-jta_1.0.1B_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jta_1.0.1B_spec/pom.xml Tue Sep 12 16:16:48 2006
@@ -30,6 +30,6 @@
<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
<name>JTA 1.0.1B</name>
- <version>${geronimoSpecsJtaVersion}</version>
+ <version>${geronimoSpecsJta101bVersion}</version>
</project>
Modified: geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml?view=diff&rev=442756&r1=437822&r2=442756
==============================================================================
--- geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jta_1.1_spec/pom.xml Tue Sep 12 16:16:48 2006
@@ -1,18 +1,36 @@
-<project>
- <parent>
- <artifactId>jee5_exp_specs</artifactId>
- <groupId>org.apache.geronimo.specs</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <name>JTA 1.1</name>
- <version>1.0-SNAPSHOT</version>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-spec-jta/</connection>
- <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-spec-jta/</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-spec-jta/</url>
- </scm>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 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.
+-->
+
+<!-- $Rev: 437256 $ $Date$ -->
+
+<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>org.apache.geronimo.specs</groupId>
+ <artifactId>specs</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <name>JTA 1.1</name>
+ <version>${geronimoSpecsJta11Version}</version>
</project>
Modified: geronimo/specs/trunk/geronimo-jta_1.1_spec/src/main/java/javax/transaction/TransactionSynchronizationRegistry.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jta_1.1_spec/src/main/java/javax/transaction/TransactionSynchronizationRegistry.java?view=diff&rev=442756&r1=437822&r2=442756
==============================================================================
--- geronimo/specs/trunk/geronimo-jta_1.1_spec/src/main/java/javax/transaction/TransactionSynchronizationRegistry.java (original)
+++ geronimo/specs/trunk/geronimo-jta_1.1_spec/src/main/java/javax/transaction/TransactionSynchronizationRegistry.java Tue Sep 12 16:16:48 2006
@@ -18,7 +18,7 @@
package javax.transaction;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public interface TransactionSynchronizationRegistry {