[jboss-cvs] JBossAS SVN: r94511 - in projects/jboss-osgi/trunk: reactor/blueprint and 4 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Oct 8 07:10:16 EDT 2009 

Author: thomas.diesler at jboss.com
Date: 2009-10-08 07:10:15 -0400 (Thu, 08 Oct 2009)
New Revision: 94511

Added:
   projects/jboss-osgi/trunk/testsuite/example/src/test/resources/webapp/MANIFEST.MF
   projects/jboss-osgi/trunk/testsuite/example/src/test/resources/webapp/web.xml
Removed:
   projects/jboss-osgi/trunk/testsuite/example/src/test/resources/webapp/META-INF/
   projects/jboss-osgi/trunk/testsuite/example/src/test/resources/webapp/WEB-INF/
Modified:
   projects/jboss-osgi/trunk/pom.xml
   projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml
   projects/jboss-osgi/trunk/reactor/blueprint/pom.xml
   projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml
   projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml
Log:
Fix webapp schema in web.xml.
Use blueprint version-1.0.0.Alpha2

Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml	2009-10-08 10:17:47 UTC (rev 94510)
+++ projects/jboss-osgi/trunk/pom.xml	2009-10-08 11:10:15 UTC (rev 94511)
@@ -37,14 +37,13 @@
   <!-- Properties -->
   <properties>
     <version.aqute.bnd>0.0.356</version.aqute.bnd>
-    <version.apache.commons.logging>1.1.1</version.apache.commons.logging>
     <version.apache.felix.configadmin>1.0.10</version.apache.felix.configadmin>
     <version.apache.felix.core>1.4.0</version.apache.felix.core>
     <version.apache.felix.log>1.0.0</version.apache.felix.log>
     <version.apache.felix.metatype>1.0.2</version.apache.felix.metatype>
     <version.izpack>4.3.1</version.izpack>
     <version.jboss.osgi.apache.xerces>2.9.1.SP2</version.jboss.osgi.apache.xerces>
-    <version.jboss.osgi.blueprint>1.0.0.Beta1</version.jboss.osgi.blueprint>
+    <version.jboss.osgi.blueprint>1.0.0.Alpha2</version.jboss.osgi.blueprint>
     <version.jboss.osgi.common>1.0.2-SNAPSHOT</version.jboss.osgi.common>
     <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
     <version.jboss.osgi.framework>1.0.0-SNAPSHOT</version.jboss.osgi.framework>
@@ -224,11 +223,6 @@
         <artifactId>pax-web-jetty-bundle</artifactId>
         <version>${version.ops4j.pax.web}</version>
       </dependency>
-      <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>${version.apache.commons.logging}</version>
-      </dependency> 
       
       <!-- org.osgi -->
       <dependency>

Modified: projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml	2009-10-08 10:17:47 UTC (rev 94510)
+++ projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml	2009-10-08 11:10:15 UTC (rev 94511)
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.jboss.osgi.bundles</groupId>
     <artifactId>jboss-osgi-blueprint-parent</artifactId>
-    <version>1.0.0.Beta1</version>
+    <version>1.0.0.Alpha2</version>
   </parent>
 
   <!-- Dependencies -->

Modified: projects/jboss-osgi/trunk/reactor/blueprint/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/blueprint/pom.xml	2009-10-08 10:17:47 UTC (rev 94510)
+++ projects/jboss-osgi/trunk/reactor/blueprint/pom.xml	2009-10-08 11:10:15 UTC (rev 94511)
@@ -20,7 +20,7 @@
   <artifactId>jboss-osgi-blueprint-parent</artifactId>
   <packaging>pom</packaging>
 
-  <version>1.0.0.Beta1</version>
+  <version>1.0.0.Alpha2</version>
   
   <!-- Parent -->
   <parent>

Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml	2009-10-08 10:17:47 UTC (rev 94510)
+++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml	2009-10-08 11:10:15 UTC (rev 94511)
@@ -32,7 +32,7 @@
   <parent>
     <groupId>org.jboss.osgi.bundles</groupId>
     <artifactId>jboss-osgi-blueprint-parent</artifactId>
-    <version>1.0.0.Beta1</version>
+    <version>1.0.0.Alpha2</version>
   </parent>
 
   <!-- Properties -->

Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml	2009-10-08 10:17:47 UTC (rev 94510)
+++ projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml	2009-10-08 11:10:15 UTC (rev 94511)
@@ -63,8 +63,8 @@
     
     <!-- webapp -->
     <war destfile="${tests.output.dir}/test-libs/example-webapp.jar"
-      manifest="${tests.resources.dir}/webapp/META-INF/MANIFEST.MF"
-      webxml="${tests.resources.dir}/webapp/WEB-INF/web.xml">
+      manifest="${tests.resources.dir}/webapp/MANIFEST.MF"
+      webxml="${tests.resources.dir}/webapp/web.xml">
       <classes dir="${tests.classes.dir}">
         <include name="**/example/webapp/bundle/*.class"/>
       </classes>

Copied: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/webapp/MANIFEST.MF (from rev 94505, projects/jboss-osgi/trunk/testsuite/example/src/test/resources/webapp/META-INF/MANIFEST.MF)
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/webapp/MANIFEST.MF	                        (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/webapp/MANIFEST.MF	2009-10-08 11:10:15 UTC (rev 94511)
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-Name: example-webapp
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: example-webapp
+Bundle-ClassPath: .,WEB-INF/classes
+Import-Package: org.osgi.service.http,org.ops4j.pax.web.service,javax.servlet,javax.servlet.http
+

Copied: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/webapp/web.xml (from rev 94505, projects/jboss-osgi/trunk/testsuite/example/src/test/resources/webapp/WEB-INF/web.xml)
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/webapp/web.xml	                        (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/webapp/web.xml	2009-10-08 11:10:15 UTC (rev 94511)
@@ -0,0 +1,21 @@
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+         version="2.5">
+
+  <display-name>WebApp Sample</display-name>
+
+  <servlet>
+    <servlet-name>servlet</servlet-name>
+    <servlet-class>org.jboss.test.osgi.example.webapp.bundle.EndpointServlet</servlet-class>
+    <init-param>
+      <param-name>initProp</param-name>
+      <param-value>SomeValue</param-value>
+    </init-param>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>servlet</servlet-name>
+    <url-pattern>/servlet</url-pattern>
+  </servlet-mapping>
+
+</web-app>

More information about the jboss-cvs-commits mailing list