diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-10-15 20:42:07 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-10-15 20:42:07 +0000 |
commit | c97a45a13aee9f28e98d8709e59302bd0e9d99a3 (patch) | |
tree | 512a4371ae18c303ea107341691ec7fc3956d5f0 /branches/sca-equinox/modules | |
parent | ae6974de64571bfa5add26c204dd9e2a6e731656 (diff) |
Restrict Export-Package and refactor some internal classes
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@705036 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
8 files changed, 188 insertions, 193 deletions
diff --git a/branches/sca-equinox/modules/binding-gdata-gsoc/pom.xml b/branches/sca-equinox/modules/binding-gdata-gsoc/pom.xml index f09f835f8e..ab87388af0 100644 --- a/branches/sca-equinox/modules/binding-gdata-gsoc/pom.xml +++ b/branches/sca-equinox/modules/binding-gdata-gsoc/pom.xml @@ -69,7 +69,7 @@ <Bundle-Version>${tuscany.version}</Bundle-Version> <Bundle-SymbolicName>org.apache.tuscany.sca.binding.gdata</Bundle-SymbolicName> <Bundle-Description>${pom.name}</Bundle-Description> - <Export-Package>org.apache.tuscany.sca.binding.gdata*</Export-Package> + <Export-Package>org.apache.tuscany.sca.binding.gdata</Export-Package> </instructions> </configuration> </plugin> diff --git a/branches/sca-equinox/modules/binding-gdata-gsoc/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingProcessor.java b/branches/sca-equinox/modules/binding-gdata-gsoc/src/main/java/org/apache/tuscany/sca/binding/gdata/xml/GdataBindingProcessor.java index 952e175c8f..52f36b29ad 100644 --- a/branches/sca-equinox/modules/binding-gdata-gsoc/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/GdataBindingProcessor.java +++ b/branches/sca-equinox/modules/binding-gdata-gsoc/src/main/java/org/apache/tuscany/sca/binding/gdata/xml/GdataBindingProcessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tuscany.sca.binding.gdata.impl; +package org.apache.tuscany.sca.binding.gdata.xml; import java.util.ArrayList; import java.util.List; diff --git a/branches/sca-equinox/modules/binding-gdata-gsoc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-equinox/modules/binding-gdata-gsoc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor index 4e71818f7b..e7c37c44fe 100644 --- a/branches/sca-equinox/modules/binding-gdata-gsoc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor +++ b/branches/sca-equinox/modules/binding-gdata-gsoc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor @@ -16,4 +16,4 @@ # under the License. # Implementation class for the artifact processor extension -org.apache.tuscany.sca.binding.gdata.impl.GdataBindingProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#binding.gdata,model=org.apache.tuscany.sca.binding.gdata.GdataBinding,factory=org.apache.tuscany.sca.binding.gdata.GdataBindingFactory
\ No newline at end of file +org.apache.tuscany.sca.binding.gdata.xml.GdataBindingProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#binding.gdata,model=org.apache.tuscany.sca.binding.gdata.GdataBinding,factory=org.apache.tuscany.sca.binding.gdata.GdataBindingFactory
\ No newline at end of file diff --git a/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/pom.xml b/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/pom.xml index 428bc1b801..dd3669a7ce 100644 --- a/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/pom.xml +++ b/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/pom.xml @@ -1,139 +1,132 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> + <!-- + * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the + NOTICE file * distributed with this work for additional information * regarding copyright ownership. The ASF + licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file + except in compliance * with the License. You may obtain a copy of the License at * * + http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * + software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF + ANY * KIND, either express or implied. See the License for the * specific language governing permissions and + limitations * under the License. + --> <project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-modules</artifactId> - <version>1.4-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-modules</artifactId> + <version>1.4-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <artifactId>tuscany-binding-gdata-runtime-gsoc</artifactId> - <name>Apache Tuscany SCA Gdata Binding Extension Runtime GSOC</name> + <artifactId>tuscany-binding-gdata-runtime-gsoc</artifactId> + <name>Apache Tuscany SCA Gdata Binding Extension Runtime GSOC</name> <repositories> - <repository> - <id>com.google.gdata</id> - <url>http://people.apache.org/~lresende/google-gdata/maven/</url> - </repository> + <repository> + <id>com.google.gdata</id> + <url>http://people.apache.org/~lresende/google-gdata/maven/ + </url> + </repository> </repositories> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-gdata-gsoc</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-assembly</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-interface-java</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-data-api</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-core-spi</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-http</artifactId> - <version>1.4-SNAPSHOT</version> - </dependency> + <dependencies> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-binding-gdata-gsoc</artifactId> + <version>1.4-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-assembly</artifactId> + <version>1.4-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-interface-java</artifactId> + <version>1.4-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-data-api</artifactId> + <version>1.4-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-core-spi</artifactId> + <version>1.4-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-databinding</artifactId> + <version>1.4-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-host-http</artifactId> + <version>1.4-SNAPSHOT</version> + </dependency> <dependency> <groupId>org.apache.abdera</groupId> <artifactId>abdera-core</artifactId> - <version>0.4.0-incubating</version> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - </dependency> - - <dependency> - <groupId>com.google.gdata</groupId> - <artifactId>gdata-client</artifactId> - <version>1.0</version> - </dependency> - - <dependency> - <groupId>com.google.gdata</groupId> - <artifactId>gdata-client-meta</artifactId> - <version>1.0</version> - </dependency> - - <dependency> - <groupId>com.google.gdata</groupId> - <artifactId>gdata-core</artifactId> - <version>1.0</version> - </dependency> - - <dependency> - <groupId>com.google.gdata</groupId> - <artifactId>gdata-media</artifactId> - <version>1.0</version> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>1.4-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.4-SNAPSHOT</version> - <scope>test</scope> - </dependency> + <version>0.4.0-incubating</version> + </dependency> + + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + </dependency> + + <dependency> + <groupId>com.google.gdata</groupId> + <artifactId>gdata-client</artifactId> + <version>1.0</version> + </dependency> + + <dependency> + <groupId>com.google.gdata</groupId> + <artifactId>gdata-client-meta</artifactId> + <version>1.0</version> + </dependency> + + <dependency> + <groupId>com.google.gdata</groupId> + <artifactId>gdata-core</artifactId> + <version>1.0</version> + </dependency> + + <dependency> + <groupId>com.google.gdata</groupId> + <artifactId>gdata-media</artifactId> + <version>1.0</version> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-host-jetty</artifactId> + <version>1.4-SNAPSHOT</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-implementation-java-runtime</artifactId> + <version>1.4-SNAPSHOT</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> @@ -142,68 +135,68 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.5</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.3</version> - <exclusions> - <exclusion> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - <exclusion> - <groupId>avalon-framework</groupId> - <artifactId>avalon-framework</artifactId> - </exclusion> - </exclusions> - </dependency> - - </dependencies> - - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - - <configuration> - <instructions> - <Bundle-Version> - ${tuscany.version} + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.5</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> + <exclusions> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>avalon-framework</groupId> + <artifactId>avalon-framework</artifactId> + </exclusion> + </exclusions> + </dependency> + + </dependencies> + + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + + <configuration> + <instructions> + <Bundle-Version> + ${tuscany.version} </Bundle-Version> - <Bundle-SymbolicName> - org.apache.tuscany.sca.binding.gdata.extension + <Bundle-SymbolicName> + org.apache.tuscany.sca.binding.gdata.runtime </Bundle-SymbolicName> - <Bundle-Description> - ${pom.name} + <Bundle-Description> + ${pom.name} </Bundle-Description> - <Export-Package> - org.apache.tuscany.sca.binding.gdata* + <Export-Package> + org.apache.tuscany.sca.binding.gdata.collection </Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> + </instructions> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml b/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml index 572470ccbd..21d431c621 100644 --- a/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml +++ b/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml @@ -170,9 +170,9 @@ <configuration> <instructions> <Bundle-Version>${tuscany.version}</Bundle-Version> - <Bundle-SymbolicName>org.apache.tuscany.sca.binding.atom.abdera</Bundle-SymbolicName> + <Bundle-SymbolicName>org.apache.tuscany.sca.binding.gdata.runtime</Bundle-SymbolicName> <Bundle-Description>${pom.name}</Bundle-Description> - <Export-Package>org.apache.tuscany.sca.binding.atom*</Export-Package> + <Export-Package>org.apache.tuscany.sca.binding.gdata.collection</Export-Package> </instructions> </configuration> </plugin> diff --git a/branches/sca-equinox/modules/binding-gdata/pom.xml b/branches/sca-equinox/modules/binding-gdata/pom.xml index cf918652a6..3e2437ced7 100644 --- a/branches/sca-equinox/modules/binding-gdata/pom.xml +++ b/branches/sca-equinox/modules/binding-gdata/pom.xml @@ -61,9 +61,9 @@ <configuration> <instructions> <Bundle-Version>${tuscany.version}</Bundle-Version> - <Bundle-SymbolicName>org.apache.tuscany.sca.binding.atom</Bundle-SymbolicName> + <Bundle-SymbolicName>org.apache.tuscany.sca.binding.gdata</Bundle-SymbolicName> <Bundle-Description>${pom.name}</Bundle-Description> - <Export-Package>org.apache.tuscany.sca.binding.atom*</Export-Package> + <Export-Package>org.apache.tuscany.sca.binding.gdata</Export-Package> </instructions> </configuration> </plugin> diff --git a/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataImplementationProcessor.java b/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/xml/GDataImplementationProcessor.java index 93b326e287..a158aa2cc9 100644 --- a/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataImplementationProcessor.java +++ b/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/xml/GDataImplementationProcessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tuscany.sca.binding.gdata; +package org.apache.tuscany.sca.binding.gdata.xml; import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; @@ -24,6 +24,8 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; import org.apache.tuscany.sca.assembly.xml.Constants; +import org.apache.tuscany.sca.binding.gdata.GDataBinding; +import org.apache.tuscany.sca.binding.gdata.GDataBindingFactory; import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; diff --git a/branches/sca-equinox/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-equinox/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor index 92aad3d44d..e48d2691b8 100644 --- a/branches/sca-equinox/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor +++ b/branches/sca-equinox/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor @@ -18,4 +18,4 @@ # Implementation class for the artifact processor extension #org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#binding.gdata,model=org.apache.tuscany.sca.binding.gdata.GDataBinding,factory=org.apache.tuscany.sca.binding.gdata.GDataBindingFactory -org.apache.tuscany.sca.binding.gdata.GDataImplementationProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#binding.gdata,model=org.apache.tuscany.sca.binding.gdata.GDataBinding,factory=org.apache.tuscany.sca.binding.gdata.GDataBindingFactory
\ No newline at end of file +org.apache.tuscany.sca.binding.gdata.xml.GDataImplementationProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#binding.gdata,model=org.apache.tuscany.sca.binding.gdata.GDataBinding,factory=org.apache.tuscany.sca.binding.gdata.GDataBindingFactory
\ No newline at end of file |