From commits-return-4412-apmail-ws-commits-archive=ws.apache.org@ws.apache.org Fri Sep 19 17:57:11 2014 Return-Path: X-Original-To: apmail-ws-commits-archive@minotaur.apache.org Delivered-To: apmail-ws-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DBFE6116F7 for ; Fri, 19 Sep 2014 17:57:11 +0000 (UTC) Received: (qmail 92002 invoked by uid 500); 19 Sep 2014 17:57:11 -0000 Delivered-To: apmail-ws-commits-archive@ws.apache.org Received: (qmail 91968 invoked by uid 500); 19 Sep 2014 17:57:11 -0000 Mailing-List: contact commits-help@ws.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ws.apache.org Delivered-To: mailing list commits@ws.apache.org Received: (qmail 91959 invoked by uid 99); 19 Sep 2014 17:57:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Sep 2014 17:57:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Sep 2014 17:56:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AD47E238883D; Fri, 19 Sep 2014 17:56:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@ws.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140919175646.AD47E238883D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ xmlschema-core + xmlschema-walker xmlschema-bundle-test w3c-testcases - xmlschema-walker install + org.apache.felix + maven-bundle-plugin + 2.4.0 + true + + + The Apache Software Foundation + org.apache + The Apache Software Foundation + http://ws.apache.org/xmlschema/ + <_failok>true + <_nouses>true + <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@))) + + * + + + + + org.apache.maven.plugins maven-assembly-plugin 2.4.1 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 @@ test + org.apache.ws.xmlschema + xmlschema-walker + ${project.version} + test + + org.ops4j.pax.exam pax-exam 3.4.0 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 @@ org.apache.felix maven-bundle-plugin - 2.0.0 - true !org.apache.ws.commons.schema.internal,org.apache.ws.commons.schema*;version=${project.version} 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 @@ xmlschema-walker xmlschema-walker Code to walk an XML Schema and confirm an XML Document conforms to it. - jar + bundle org.apache.ws.xmlschema @@ -26,4 +26,14 @@ test + + + + org.apache.felix + maven-bundle-plugin + + + + + \ No newline at end of file