openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r891002 - in /incubator/openwebbeans/trunk: ./ atinject-api/ atinject-tck/ samples/ejb-sample/ samples/ejb-telephone/ samples/guess/ samples/jms-sample/ samples/reservation/ webbeans-api/ webbeans-impl/ webbeans-impl/src/main/java/org/apach...
Date Tue, 15 Dec 2009 21:31:59 GMT
Author: gerdogdu
Date: Tue Dec 15 21:31:59 2009
New Revision: 891002

URL: http://svn.apache.org/viewvc?rev=891002&view=rev
Log:
Removing webbeans-api and atinject-api and update poms

Removed:
    incubator/openwebbeans/trunk/atinject-api/
    incubator/openwebbeans/trunk/webbeans-api/
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/Boot.java
Modified:
    incubator/openwebbeans/trunk/atinject-tck/pom.xml
    incubator/openwebbeans/trunk/pom.xml
    incubator/openwebbeans/trunk/samples/ejb-sample/pom.xml
    incubator/openwebbeans/trunk/samples/ejb-telephone/pom.xml
    incubator/openwebbeans/trunk/samples/guess/pom.xml
    incubator/openwebbeans/trunk/samples/jms-sample/pom.xml
    incubator/openwebbeans/trunk/samples/reservation/pom.xml
    incubator/openwebbeans/trunk/webbeans-impl/pom.xml
    incubator/openwebbeans/trunk/webbeans-resource/pom.xml

Modified: incubator/openwebbeans/trunk/atinject-tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/atinject-tck/pom.xml?rev=891002&r1=891001&r2=891002&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/atinject-tck/pom.xml (original)
+++ incubator/openwebbeans/trunk/atinject-tck/pom.xml Tue Dec 15 21:31:59 2009
@@ -61,12 +61,13 @@
          <scope>test</scope>
       </dependency>
 
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>atinject-api</artifactId>
-            <scope>test</scope>            
-        </dependency>
-        
+         <dependency>
+                 <groupId>org.apache.geronimo.specs</groupId>
+                 <artifactId>geronimo-atinject_1.0_spec</artifactId>
+                 <version>${geronimo_atinject.version}</version>
+                 <scope>test</scope>
+         </dependency>
+
         <dependency>
             <groupId>org.apache.openwebbeans</groupId>
             <artifactId>openwebbeans-porting</artifactId>

Modified: incubator/openwebbeans/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/pom.xml?rev=891002&r1=891001&r2=891002&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/pom.xml (original)
+++ incubator/openwebbeans/trunk/pom.xml Tue Dec 15 21:31:59 2009
@@ -332,8 +332,6 @@
     </reporting>
 	
     <modules>
-        <module>atinject-api</module>
-        <module>webbeans-api</module>
         <module>webbeans-impl</module>
         <module>webbeans-openejb</module>
         <module>webbeans-jms</module>
@@ -385,6 +383,15 @@
              <url>http://repo1.maven.org/maven2</url>
            </repository>
 
+          <repository>
+            <id>geronimo-snapshots</id>
+            <name>Apache Nexus Snapshots</name>
+            <url>https://repository.apache.org/content/groups/snapshots-group</url>
+            <snapshots>
+              <enabled>true</enabled>
+            </snapshots>
+         </repository>
+
 	</repositories>
 
 	<dependencyManagement>
@@ -490,15 +497,15 @@
 			</dependency>
 
 			<dependency>
-				<groupId>org.apache.openwebbeans</groupId>
-				<artifactId>atinject-api</artifactId>
-				<version>${openwebbeans.version}</version>
+				<groupId>org.apache.geronimo.specs</groupId>
+				<artifactId>geronimo-cdi_1.0_spec</artifactId>
+				<version>${geronimo_cdi.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.apache.openwebbeans</groupId>
-				<artifactId>openwebbeans-api</artifactId>
-				<version>${openwebbeans.version}</version>
+				<groupId>org.apache.geronimo.specs</groupId>
+				<artifactId>geronimo-atinject_1.0_spec</artifactId>
+				<version>${geronimo_atinject.version}</version>
 			</dependency>
 
 			<!--  this is used for TCK tests        -->
@@ -578,6 +585,8 @@
       
 	<properties>
           <openwebbeans.version>1.0.0-incubating-SNAPSHOT</openwebbeans.version>
+          <geronimo_cdi.version>1.0-SNAPSHOT</geronimo_cdi.version>
+          <geronimo_atinject.version>1.0-SNAPSHOT</geronimo_atinject.version>
 	  <siteId>/OWB/1.0.0-incubating-M3-rc2/plugins</siteId>
 	</properties>
 

Modified: incubator/openwebbeans/trunk/samples/ejb-sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/ejb-sample/pom.xml?rev=891002&r1=891001&r2=891002&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/ejb-sample/pom.xml (original)
+++ incubator/openwebbeans/trunk/samples/ejb-sample/pom.xml Tue Dec 15 21:31:59 2009
@@ -41,6 +41,12 @@
 		</plugins>
 		
 	</build>
+	
+    <properties>
+    	<geronimo_cdi.version>1.0-SNAPSHOT</geronimo_cdi.version>
+    	<geronimo_atinject.version>1.0-SNAPSHOT</geronimo_atinject.version>
+    </properties>
+	
 
 	<dependencies>
 
@@ -58,13 +64,20 @@
 			<version>1.1.14</version>
 		</dependency>
 
-		<!-- JSR-299 API, provided -->
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-api</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
-		</dependency>
+         <dependency>
+                 <groupId>org.apache.geronimo.specs</groupId>
+                 <artifactId>geronimo-cdi_1.0_spec</artifactId>
+                 <version>${geronimo_cdi.version}</version>
+                 <scope>provided</scope>
+         </dependency>
+
+         <dependency>
+                 <groupId>org.apache.geronimo.specs</groupId>
+                 <artifactId>geronimo-atinject_1.0_spec</artifactId>
+                 <version>${geronimo_atinject.version}</version>
+                 <scope>provided</scope>
+         </dependency>
+
 		
 		<!-- JSR-299 Implementation -->
 		<dependency>

Modified: incubator/openwebbeans/trunk/samples/ejb-telephone/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/ejb-telephone/pom.xml?rev=891002&r1=891001&r2=891002&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/ejb-telephone/pom.xml (original)
+++ incubator/openwebbeans/trunk/samples/ejb-telephone/pom.xml Tue Dec 15 21:31:59 2009
@@ -41,6 +41,12 @@
 		</plugins>
 		
 	</build>
+	
+    <properties>
+    	<geronimo_cdi.version>1.0-SNAPSHOT</geronimo_cdi.version>
+    	<geronimo_atinject.version>1.0-SNAPSHOT</geronimo_atinject.version>
+    </properties>
+	
 
 	<dependencies>
 
@@ -51,13 +57,20 @@
 			<version>1.1.14</version>
 		</dependency>
 
-		<!-- JSR-299 API, provided -->
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-api</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
-		</dependency>
+         <dependency>
+                 <groupId>org.apache.geronimo.specs</groupId>
+                 <artifactId>geronimo-cdi_1.0_spec</artifactId>
+                 <version>${geronimo_cdi.version}</version>
+                 <scope>provided</scope>
+         </dependency>
+
+         <dependency>
+                 <groupId>org.apache.geronimo.specs</groupId>
+                 <artifactId>geronimo-atinject_1.0_spec</artifactId>
+                 <version>${geronimo_atinject.version}</version>
+                 <scope>provided</scope>
+         </dependency>
+
 		
 		<!-- JSR-299 Implementation -->
 		<dependency>

Modified: incubator/openwebbeans/trunk/samples/guess/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/pom.xml?rev=891002&r1=891001&r2=891002&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/pom.xml (original)
+++ incubator/openwebbeans/trunk/samples/guess/pom.xml Tue Dec 15 21:31:59 2009
@@ -31,6 +31,12 @@
 	<build>
 		<finalName>guess</finalName>
 	</build>
+        
+    <properties>
+    	<geronimo_cdi.version>1.0-SNAPSHOT</geronimo_cdi.version>
+    	<geronimo_atinject.version>1.0-SNAPSHOT</geronimo_atinject.version>
+    </properties>
+        
 
 	<dependencies>
 
@@ -41,13 +47,19 @@
 			<scope>test</scope>
 		</dependency>
 		
-		<!-- JSR-299 API -->
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-api</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
-		</dependency>		
+         <dependency>
+                 <groupId>org.apache.geronimo.specs</groupId>
+                 <artifactId>geronimo-cdi_1.0_spec</artifactId>
+                 <version>${geronimo_cdi.version}</version>
+                 <scope>provided</scope>
+         </dependency>
+
+         <dependency>
+                 <groupId>org.apache.geronimo.specs</groupId>
+                 <artifactId>geronimo-atinject_1.0_spec</artifactId>
+                 <version>${geronimo_atinject.version}</version>
+                 <scope>provided</scope>
+         </dependency>
 		
 		<!-- JSF Facelet -->
 		<dependency>
@@ -84,12 +96,18 @@
 		<profile>
 			<id>jetty</id>
 			<dependencies>				
-				<!-- JSR-299 API -->
-				<dependency>
-					<groupId>org.apache.openwebbeans</groupId>
-					<artifactId>openwebbeans-api</artifactId>
-					<version>${project.version}</version>
-				</dependency>
+       
+	                 <dependency>
+                                <groupId>org.apache.geronimo.specs</groupId>
+                                <artifactId>geronimo-cdi_1.0_spec</artifactId>
+                                <version>${geronimo_cdi.version}</version>
+                        </dependency>
+
+                        <dependency>
+                                <groupId>org.apache.geronimo.specs</groupId>
+                                <artifactId>geronimo-atinject_1.0_spec</artifactId>
+                                <version>${geronimo_atinject.version}</version>
+                        </dependency>
 				
 				<!-- OWB implementation per application -->
 				<dependency>
@@ -132,4 +150,4 @@
 			</build>
 		</profile>		
 	</profiles>
-</project>
\ No newline at end of file
+</project>

Modified: incubator/openwebbeans/trunk/samples/jms-sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/jms-sample/pom.xml?rev=891002&r1=891001&r2=891002&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/jms-sample/pom.xml (original)
+++ incubator/openwebbeans/trunk/samples/jms-sample/pom.xml Tue Dec 15 21:31:59 2009
@@ -31,6 +31,11 @@
 	<build>
 		<finalName>jms-sample</finalName>
 	</build>
+	
+    <properties>
+    	<geronimo_cdi.version>1.0-SNAPSHOT</geronimo_cdi.version>
+    	<geronimo_atinject.version>1.0-SNAPSHOT</geronimo_atinject.version>
+    </properties>	
 
 	<dependencies>
 
@@ -48,12 +53,20 @@
 			<version>1.1.14</version>
 		</dependency>
 
-		<!-- JSR-299 API -->
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-api</artifactId>
-			<version>1.0.0-incubating-SNAPSHOT</version>
-		</dependency>
+         <dependency>
+                 <groupId>org.apache.geronimo.specs</groupId>
+                 <artifactId>geronimo-cdi_1.0_spec</artifactId>
+                 <version>${geronimo_cdi.version}</version>
+                 <scope>provided</scope>
+         </dependency>
+
+         <dependency>
+                 <groupId>org.apache.geronimo.specs</groupId>
+                 <artifactId>geronimo-atinject_1.0_spec</artifactId>
+                 <version>${geronimo_atinject.version}</version>
+                 <scope>provided</scope>
+         </dependency>
+
 				
 		<!-- JSF Plugin -->
 		<dependency>

Modified: incubator/openwebbeans/trunk/samples/reservation/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/reservation/pom.xml?rev=891002&r1=891001&r2=891002&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/reservation/pom.xml (original)
+++ incubator/openwebbeans/trunk/samples/reservation/pom.xml Tue Dec 15 21:31:59 2009
@@ -32,6 +32,11 @@
 		<finalName>reservation</finalName>
 	</build>
 
+    <properties>
+    	<geronimo_cdi.version>1.0-SNAPSHOT</geronimo_cdi.version>
+    	<geronimo_atinject.version>1.0-SNAPSHOT</geronimo_atinject.version>
+    </properties>
+
 	<dependencies>
 		
 		<!-- JUnit Test -->
@@ -48,13 +53,19 @@
 			<version>1.1.14</version>
 		</dependency>
 		
-		<!-- JSR 299 API -->
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-api</artifactId>
-			<version>${project.version}</version>
-			<scope>provided</scope>
-		</dependency>
+         <dependency>
+                 <groupId>org.apache.geronimo.specs</groupId>
+                 <artifactId>geronimo-cdi_1.0_spec</artifactId>
+                 <version>${geronimo_cdi.version}</version>
+                 <scope>provided</scope>
+         </dependency>
+
+         <dependency>
+                 <groupId>org.apache.geronimo.specs</groupId>
+                 <artifactId>geronimo-atinject_1.0_spec</artifactId>
+                 <version>${geronimo_atinject.version}</version>
+                 <scope>provided</scope>
+         </dependency>
 		
 		<!-- JSF Plugin -->
 		<dependency>
@@ -127,12 +138,17 @@
 			<id>jetty</id>
 			<dependencies>
 				
-				<!-- OWB API -->
-				<dependency>
-					<groupId>org.apache.openwebbeans</groupId>
-					<artifactId>openwebbeans-api</artifactId>
-					<version>${project.version}</version>
-				</dependency>
+		         <dependency>
+		                 <groupId>org.apache.geronimo.specs</groupId>
+		                 <artifactId>geronimo-cdi_1.0_spec</artifactId>
+		                 <version>${geronimo_cdi.version}</version>
+		         </dependency>
+		
+		         <dependency>
+		                 <groupId>org.apache.geronimo.specs</groupId>
+		                 <artifactId>geronimo-atinject_1.0_spec</artifactId>
+		                 <version>${geronimo_atinject.version}</version>
+		         </dependency>
 				
 				<!-- OWB Impl -->
 				<dependency>

Modified: incubator/openwebbeans/trunk/webbeans-impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/pom.xml?rev=891002&r1=891001&r2=891002&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/pom.xml (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/pom.xml Tue Dec 15 21:31:59 2009
@@ -76,13 +76,18 @@
 		    <optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-api</artifactId>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-cdi_1.0_spec</artifactId>
 		</dependency>
+                <dependency>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-atinject_1.0_spec</artifactId>
+                </dependency>
+
 		<dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
+            	    <groupId>junit</groupId>
+	            <artifactId>junit</artifactId>
+       		    <scope>test</scope>
         </dependency>
 
         <!-- the following dependencies are needed for tests only -->      

Modified: incubator/openwebbeans/trunk/webbeans-resource/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-resource/pom.xml?rev=891002&r1=891001&r2=891002&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-resource/pom.xml (original)
+++ incubator/openwebbeans/trunk/webbeans-resource/pom.xml Tue Dec 15 21:31:59 2009
@@ -28,12 +28,11 @@
 	<packaging>jar</packaging>
 	<description>OpenWebBeans Resource Integration</description>
 	<dependencies>
-
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
+                <dependency>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-cdi_1.0_spec</artifactId>
+                        <scope>provided</scope>
+                </dependency>
 		
 		
 		<dependency>



Mime
View raw message