ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1626286 - in /webservices/xmlschema/trunk: pom.xml xmlschema-bundle-test/pom.xml xmlschema-bundle-test/src/test/java/org/apache/ws/xmlschema/bundletest/XmlSchemaBundleTest.java xmlschema-core/pom.xml xmlschema-walker/pom.xml
Date Fri, 19 Sep 2014 17:56:46 GMT
Author: dkulp
Date: Fri Sep 19 17:56:46 2014
New Revision: 1626286

URL: http://svn.apache.org/r1626286
Log:
Turn the new walker module into a bundle.  Update the bundle configuration to put a better
URL, etc...

Modified:
    webservices/xmlschema/trunk/pom.xml
    webservices/xmlschema/trunk/xmlschema-bundle-test/pom.xml
    webservices/xmlschema/trunk/xmlschema-bundle-test/src/test/java/org/apache/ws/xmlschema/bundletest/XmlSchemaBundleTest.java
    webservices/xmlschema/trunk/xmlschema-core/pom.xml
    webservices/xmlschema/trunk/xmlschema-walker/pom.xml

Modified: webservices/xmlschema/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/pom.xml?rev=1626286&r1=1626285&r2=1626286&view=diff
==============================================================================
--- webservices/xmlschema/trunk/pom.xml (original)
+++ webservices/xmlschema/trunk/pom.xml Fri Sep 19 17:56:46 2014
@@ -82,15 +82,35 @@
     </properties>
     <modules>
         <module>xmlschema-core</module>
+        <module>xmlschema-walker</module>
         <module>xmlschema-bundle-test</module>
         <module>w3c-testcases</module>
-        <module>xmlschema-walker</module>
     </modules>
     <build>
         <defaultGoal>install</defaultGoal>
         <pluginManagement>
             <plugins>
                 <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>2.4.0</version>
+                    <extensions>true</extensions>
+                    <configuration>
+                        <instructions>
+                            <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+                            <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+                            <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
+                            <Bundle-DocURL>http://ws.apache.org/xmlschema/</Bundle-DocURL>
+                            <_failok>true</_failok>
+                            <_nouses>true</_nouses>
+                            <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+                            <Import-Package>
+                                *
+                            </Import-Package>
+                        </instructions>
+                    </configuration>
+                </plugin>
+                <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
                     <version>2.4.1</version>

Modified: webservices/xmlschema/trunk/xmlschema-bundle-test/pom.xml
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-bundle-test/pom.xml?rev=1626286&r1=1626285&r2=1626286&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-bundle-test/pom.xml (original)
+++ webservices/xmlschema/trunk/xmlschema-bundle-test/pom.xml Fri Sep 19 17:56:46 2014
@@ -42,6 +42,12 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.ws.xmlschema</groupId>
+            <artifactId>xmlschema-walker</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam</artifactId>
             <version>3.4.0</version>

Modified: webservices/xmlschema/trunk/xmlschema-bundle-test/src/test/java/org/apache/ws/xmlschema/bundletest/XmlSchemaBundleTest.java
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-bundle-test/src/test/java/org/apache/ws/xmlschema/bundletest/XmlSchemaBundleTest.java?rev=1626286&r1=1626285&r2=1626286&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-bundle-test/src/test/java/org/apache/ws/xmlschema/bundletest/XmlSchemaBundleTest.java
(original)
+++ webservices/xmlschema/trunk/xmlschema-bundle-test/src/test/java/org/apache/ws/xmlschema/bundletest/XmlSchemaBundleTest.java
Fri Sep 19 17:56:46 2014
@@ -20,13 +20,11 @@
 package org.apache.ws.xmlschema.bundletest;
 
 import junit.framework.Assert;
-
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.apache.ws.commons.schema.internal.DummyInternalClass;
-
+import org.apache.ws.commons.schema.walker.XmlSchemaWalker;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
 import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.CoreOptions;
 import org.ops4j.pax.exam.Option;
@@ -42,7 +40,9 @@ public class XmlSchemaBundleTest {
     public static Option[] configuration() {
         return CoreOptions.options(CoreOptions.junitBundles(),
                                    CoreOptions.provision(CoreOptions.mavenBundle()
-                                       .groupId("org.apache.ws.xmlschema").artifactId("xmlschema-core")));
+                                       .groupId("org.apache.ws.xmlschema").artifactId("xmlschema-core")),
+                                   CoreOptions.provision(CoreOptions.mavenBundle()
+                                       .groupId("org.apache.ws.xmlschema").artifactId("xmlschema-walker")));
     }
 
     @Test(expected = java.lang.NoClassDefFoundError.class)
@@ -54,5 +54,8 @@ public class XmlSchemaBundleTest {
     public void testSchemaAvailable() {
         XmlSchemaCollection collection = new XmlSchemaCollection();
         Assert.assertNotNull(collection);
+        XmlSchemaWalker walker = new XmlSchemaWalker(collection);
+        Assert.assertNotNull(walker);
     }
+    
 }

Modified: webservices/xmlschema/trunk/xmlschema-core/pom.xml
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-core/pom.xml?rev=1626286&r1=1626285&r2=1626286&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-core/pom.xml (original)
+++ webservices/xmlschema/trunk/xmlschema-core/pom.xml Fri Sep 19 17:56:46 2014
@@ -78,8 +78,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.0.0</version>
-                <extensions>true</extensions>
                 <configuration>
                     <instructions>
                         <Export-Package>!org.apache.ws.commons.schema.internal,org.apache.ws.commons.schema*;version=${project.version}</Export-Package>

Modified: webservices/xmlschema/trunk/xmlschema-walker/pom.xml
URL: http://svn.apache.org/viewvc/webservices/xmlschema/trunk/xmlschema-walker/pom.xml?rev=1626286&r1=1626285&r2=1626286&view=diff
==============================================================================
--- webservices/xmlschema/trunk/xmlschema-walker/pom.xml (original)
+++ webservices/xmlschema/trunk/xmlschema-walker/pom.xml Fri Sep 19 17:56:46 2014
@@ -8,7 +8,7 @@
   <artifactId>xmlschema-walker</artifactId>
   <name>xmlschema-walker</name>
   <description>Code to walk an XML Schema and confirm an XML Document conforms to it.</description>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
   <dependencies>
     <dependency>
       <groupId>org.apache.ws.xmlschema</groupId>
@@ -26,4 +26,14 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <build>
+      <plugins>
+          <plugin>
+              <groupId>org.apache.felix</groupId>
+              <artifactId>maven-bundle-plugin</artifactId>
+              <configuration>
+              </configuration>
+          </plugin>
+      </plugins>
+  </build>
 </project>
\ No newline at end of file



Mime
View raw message