From 7fb7b9b9d9cfa8d2be0c588e5531c03e640424a8 Mon Sep 17 00:00:00 2001 From: antelder Date: Tue, 17 Jun 2008 09:27:31 +0000 Subject: Fix distribution build by going back to the old shade plugin and removing all the test classes from being included in various modules git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@668583 13f79535-47bb-0310-9956-ffa450edef68 --- branches/sca-java-1.3/distribution/bundle/pom.xml | 187 ++++++++------------- .../modules/databinding-jaxb-axiom/pom.xml | 2 +- .../sca-java-1.3/modules/databinding-jaxb/pom.xml | 2 +- .../modules/databinding-sdo-axiom/pom.xml | 4 +- .../sca-java-1.3/modules/databinding-sdo/pom.xml | 4 +- branches/sca-java-1.3/tools/java2wsdl/pom.xml | 2 +- branches/sca-java-1.3/tools/wsdl2java/pom.xml | 2 +- 7 files changed, 78 insertions(+), 125 deletions(-) (limited to 'branches/sca-java-1.3') diff --git a/branches/sca-java-1.3/distribution/bundle/pom.xml b/branches/sca-java-1.3/distribution/bundle/pom.xml index 914791e6be..612d4a137c 100644 --- a/branches/sca-java-1.3/distribution/bundle/pom.xml +++ b/branches/sca-java-1.3/distribution/bundle/pom.xml @@ -223,11 +223,11 @@ tuscany-databinding-jaxb ${pom.version} - + ${pom.groupId} tuscany-databinding-sdo-axiom @@ -451,46 +451,24 @@ ${pom.version} - - - - stax - stax-api - 1.0.1 - - - - org.codehaus.woodstox - wstx-asl - 3.2.1 - runtime - - - - org.apache.geronimo.specs - geronimo-commonj_1.1_spec - 1.0 - - - org.apache.neethi - neethi - 2.0.2 + org.apache.tuscany.sdo + tuscany-sdo-impl + 1.1-incubating + + + + org.codehaus.woodstox + wstx-asl + + - @@ -507,187 +485,162 @@ - org.apache.maven.plugins - maven-shade-plugin + org.codehaus.mojo + shade-maven-plugin + 1.0-alpha-7 - package shade - org.apache.tuscany.sca - + org.apache.tuscany false - ${createSourcesJar} - false - true - - - org.apache.tuscany.sca:tuscany-interface-java-jaxws - - com/example/** - - - - org.apache.tuscany.sca:tuscany-databinding-jaxb - - com/example/** - - - - org.apache.tuscany.sca:tuscany-databinding-sdo - - com/example/** - - - - ${project.groupId}:${project.artifactId} - - org/** - - - + + + org.apache.tuscany.sdo:tuscany-sdo-impl + + - + META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory - + META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory - + META-INF/services/org.apache.tuscany.sca.binding.feed.AtomBindingFactory - + META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory - + META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory - + META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory - + META-INF/services/org.apache.tuscany.sca.binding.http.HTTPResourceBindingFactory - + META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory - + META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory - + META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint - + META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory - + META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint - + META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor - + META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint - + META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor - + META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint - + META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor - + META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint - + META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver - + META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint - + META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener - + META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint - + META-INF/services/org.apache.tuscany.sca.core.ModuleActivator - + META-INF/services/org.apache.tuscany.sca.databinding.DataBinding - + META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint - + META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer - + META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer - + META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint - + META-INF/services/org.apache.tuscany.sca.extension.helper.BindingActivator - + META-INF/services/org.apache.tuscany.sca.extension.helper.ImplementationActivator - + META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint - + META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint - + META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory - + META-INF/services/org.apache.tuscany.sca.implementation.resource.ResourceImplementationFactory - + META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor - + META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory - + META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory - + META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory - + META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory - + META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint - + META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint - + META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator - + META-INF/services/org.apache.tuscany.sca.work.WorkScheduler - + META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler - + META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory - + META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider diff --git a/branches/sca-java-1.3/modules/databinding-jaxb-axiom/pom.xml b/branches/sca-java-1.3/modules/databinding-jaxb-axiom/pom.xml index de5d88822b..4267c4a9bf 100644 --- a/branches/sca-java-1.3/modules/databinding-jaxb-axiom/pom.xml +++ b/branches/sca-java-1.3/modules/databinding-jaxb-axiom/pom.xml @@ -149,7 +149,7 @@ generate-jaxb - generate-sources + generate-test-sources generate diff --git a/branches/sca-java-1.3/modules/databinding-jaxb/pom.xml b/branches/sca-java-1.3/modules/databinding-jaxb/pom.xml index bda47ea56c..2d0c62c8ee 100644 --- a/branches/sca-java-1.3/modules/databinding-jaxb/pom.xml +++ b/branches/sca-java-1.3/modules/databinding-jaxb/pom.xml @@ -155,7 +155,7 @@ generate-jaxb - generate-sources + generate-test-sources generate diff --git a/branches/sca-java-1.3/modules/databinding-sdo-axiom/pom.xml b/branches/sca-java-1.3/modules/databinding-sdo-axiom/pom.xml index e1dd70f338..5608cf45d9 100644 --- a/branches/sca-java-1.3/modules/databinding-sdo-axiom/pom.xml +++ b/branches/sca-java-1.3/modules/databinding-sdo-axiom/pom.xml @@ -120,7 +120,7 @@ generate-po-sdo - generate-sources + generate-test-sources ${basedir}/src/test/resources/ipo.xsd com.example.ipo.sdo @@ -134,7 +134,7 @@ generate-stock-sdo - generate-sources + generate-test-sources ${basedir}/src/test/resources/stock.xsd com.example.stock.sdo diff --git a/branches/sca-java-1.3/modules/databinding-sdo/pom.xml b/branches/sca-java-1.3/modules/databinding-sdo/pom.xml index 7d97cbcfdc..48a8d53803 100644 --- a/branches/sca-java-1.3/modules/databinding-sdo/pom.xml +++ b/branches/sca-java-1.3/modules/databinding-sdo/pom.xml @@ -85,7 +85,7 @@ generate-po-sdo - generate-sources + generate-test-sources ${basedir}/src/test/resources/ipo.xsd com.example.ipo.sdo @@ -99,7 +99,7 @@ generate-stock-sdo - generate-sources + generate-test-sources ${basedir}/src/test/resources/stock.xsd com.example.stock.sdo diff --git a/branches/sca-java-1.3/tools/java2wsdl/pom.xml b/branches/sca-java-1.3/tools/java2wsdl/pom.xml index f67d21178f..88c53e510c 100644 --- a/branches/sca-java-1.3/tools/java2wsdl/pom.xml +++ b/branches/sca-java-1.3/tools/java2wsdl/pom.xml @@ -196,7 +196,7 @@ generate-sdo - generate-sources + generate-test-sources ${basedir}/src/test/resources/CreditScoreDocLit.wsdl org.example.creditscore.doclit diff --git a/branches/sca-java-1.3/tools/wsdl2java/pom.xml b/branches/sca-java-1.3/tools/wsdl2java/pom.xml index 80c7054f7f..56e7efcafe 100644 --- a/branches/sca-java-1.3/tools/wsdl2java/pom.xml +++ b/branches/sca-java-1.3/tools/wsdl2java/pom.xml @@ -207,7 +207,7 @@ add-test-source - generate-sources + generate-test-sources add-test-source -- cgit v1.2.3