You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/01/29 01:05:47 UTC
svn commit: r616114 - in /incubator/tuscany/java/sca/modules:
contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/
contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/
contribution-impl/src/te...
Author: jsdelfino
Date: Mon Jan 28 16:05:37 2008
New Revision: 616114
URL: http://svn.apache.org/viewvc?rev=616114&view=rev
Log:
More cleanup and simplification of the contribution model. Also added and fixed javadoc comments.
Added:
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java (with props)
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Workspace.java (with props)
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java (with props)
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/WorkspaceImpl.java (with props)
Removed:
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ArtifactTypeDescriberImpl.java
incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContentTypeDescriberImplTestCase.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java
Modified:
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleArtifactResolverTestCase.java
incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java Mon Jan 28 16:05:37 2008
@@ -29,7 +29,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.sca.contribution.ContentType;
+import org.apache.tuscany.sca.contribution.PackageType;
import org.apache.tuscany.sca.contribution.processor.PackageProcessor;
import org.apache.tuscany.sca.contribution.service.ContributionException;
import org.apache.tuscany.sca.contribution.service.util.FileHelper;
@@ -43,7 +43,7 @@
/**
* Package-type that this package processor can handle
*/
- public static final String PACKAGE_TYPE = ContentType.FOLDER;
+ public static final String PACKAGE_TYPE = PackageType.FOLDER;
public FolderContributionProcessor() {
}
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java Mon Jan 28 16:05:37 2008
@@ -31,7 +31,7 @@
import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
-import org.apache.tuscany.sca.contribution.ContentType;
+import org.apache.tuscany.sca.contribution.PackageType;
import org.apache.tuscany.sca.contribution.processor.PackageProcessor;
import org.apache.tuscany.sca.contribution.service.ContributionException;
@@ -44,7 +44,7 @@
/**
* Package-type that this package processor can handle
*/
- public static final String PACKAGE_TYPE = ContentType.JAR;
+ public static final String PACKAGE_TYPE = PackageType.JAR;
public JarContributionProcessor() {
}
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java Mon Jan 28 16:05:37 2008
@@ -293,11 +293,9 @@
// Create contribution model resolver
if (modelResolver == null) {
- modelResolver = new ExtensibleModelResolver(contribution, modelResolvers, modelFactories);
- }
-
- if (modelResolver instanceof ExtensibleModelResolver) {
- ((ExtensibleModelResolver)modelResolver).setDomainResolver(domainResolver);
+ //FIXME Remove this domain resolver, visibility of policy declarations should be handled by
+ // the contribution import/export mechanism instead of this domainResolver hack.
+ modelResolver = new ExtensibleModelResolver(contribution, modelResolvers, modelFactories, domainResolver);
}
//set contribution initial information
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java Mon Jan 28 16:05:37 2008
@@ -26,6 +26,7 @@
import java.util.Map;
import org.apache.tuscany.sca.contribution.ContentType;
+import org.apache.tuscany.sca.contribution.PackageType;
import org.apache.tuscany.sca.contribution.service.TypeDescriber;
import org.apache.tuscany.sca.contribution.service.util.FileHelper;
@@ -46,7 +47,7 @@
* Initialize contentType registry with know types based on known file extensions
*/
private void init() {
- contentTypeRegistry.put("JAR", ContentType.JAR);
+ contentTypeRegistry.put("JAR", PackageType.JAR);
}
protected String resolveContentyTypeByExtension(URL resourceURL) {
@@ -73,7 +74,7 @@
if (resourceURL.getProtocol().equals("file") && FileHelper.toFile(resourceURL).isDirectory()) {
// Special case : contribution is a folder
- contentType = ContentType.FOLDER;
+ contentType = PackageType.FOLDER;
} else {
contentType = resolveContentyTypeByExtension(resourceURL);
if (contentType == null) {
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleArtifactResolverTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleArtifactResolverTestCase.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleArtifactResolverTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleArtifactResolverTestCase.java Mon Jan 28 16:05:37 2008
@@ -45,7 +45,7 @@
ModelFactoryExtensionPoint factories = new DefaultModelFactoryExtensionPoint();
- resolver = new ExtensibleModelResolver(null, resolvers, factories);
+ resolver = new ExtensibleModelResolver(null, resolvers, factories, null);
factory = new DefaultContributionFactory();
}
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java Mon Jan 28 16:05:37 2008
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sca.contribution.ContentType;
+import org.apache.tuscany.sca.contribution.PackageType;
import org.apache.tuscany.sca.contribution.service.impl.PackageTypeDescriberImpl;
public class PackageTypeDescriberImplTestCase extends TestCase {
@@ -30,17 +30,17 @@
public void testResolveArchivePackageType() throws Exception {
URL artifactURL = getClass().getResource("/deployables/sample-calculator.jar");
- assertEquals(ContentType.JAR, this.packageTypeDescriber.getType(artifactURL, null));
+ assertEquals(PackageType.JAR, this.packageTypeDescriber.getType(artifactURL, null));
}
public void testResolveFolderPackageType() throws Exception {
URL artifactURL = getClass().getResource("/deployables/");
- assertEquals(ContentType.FOLDER, this.packageTypeDescriber.getType(artifactURL, null));
+ assertEquals(PackageType.FOLDER, this.packageTypeDescriber.getType(artifactURL, null));
}
public void testResolveFolder2PackageType() throws Exception {
URL artifactURL = getClass().getResource("/deployables");
- assertEquals(ContentType.FOLDER, this.packageTypeDescriber.getType(artifactURL, null));
+ assertEquals(PackageType.FOLDER, this.packageTypeDescriber.getType(artifactURL, null));
}
Modified: incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java Mon Jan 28 16:05:37 2008
@@ -44,7 +44,7 @@
ModelFactoryExtensionPoint factories = new DefaultModelFactoryExtensionPoint();
- resolver = new ExtensibleModelResolver(null, resolvers, factories);
+ resolver = new ExtensibleModelResolver(null, resolvers, factories, null);
}
@Override
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java Mon Jan 28 16:05:37 2008
@@ -20,37 +20,21 @@
package org.apache.tuscany.sca.contribution;
/**
- * Identifies internal content types for contribution package and artifacts
+ * Constants for the main supported contribution package type.
*
* @version $Rev$ $Date$
*/
+@Deprecated
public interface ContentType {
+
/**
* Java compressed contribution package
*/
String JAR = "application/x-compressed";
+
/**
* Filesystem folder contribution package
*/
String FOLDER = "application/vnd.tuscany.folder";
- /**
- * Contribution metadata file
- */
- String CONTRIBUTION_METADATA = "application/vnd.tuscany.contribution.metadata";
- /**
- * SCA Composite description file
- */
- String COMPOSITE = "application/vnd.tuscany.composite";
- /**
- * WSDL file
- */
- String WSDL = "application/vnd.tuscany.wsdl";
- /**
- * Java source/binary file
- */
- String JAVA = "application/java-vm";
- /**
- * Unkown contentType
- */
- String UNKNOWN = "content/unknown";
+
}
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java Mon Jan 28 16:05:37 2008
@@ -21,11 +21,12 @@
/**
- * Contribution model object factory.
+ * A factory for the contribution model.
*
* @version $Rev$ $Date$
*/
public interface ContributionFactory {
+
/**
* Create a contribution model object
*
@@ -46,5 +47,11 @@
*
* @return The new artifact model object
*/
- Artifact createArtifact();
+ Artifact createArtifact();
+
+ /**
+ * Create a new contribution workspace model object.
+ * @return
+ */
+ Workspace createWorkspace();
}
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java Mon Jan 28 16:05:37 2008
@@ -19,8 +19,7 @@
package org.apache.tuscany.sca.contribution;
-import org.apache.tuscany.sca.contribution.impl.ArtifactImpl;
-import org.apache.tuscany.sca.contribution.impl.ContributionImpl;
+import org.apache.tuscany.sca.contribution.impl.ContributionFactoryImpl;
/**
@@ -28,20 +27,6 @@
*
* @version $Rev$ $Date$
*/
-public class DefaultContributionFactory implements ContributionFactory {
+public class DefaultContributionFactory extends ContributionFactoryImpl {
- public Contribution createContribution() {
- return new ContributionImpl();
- }
-
- @Deprecated
- public DeployedArtifact createDeployedArtifact() {
- class DeployedArtifactImpl extends ArtifactImpl implements DeployedArtifact {
- }
- return new DeployedArtifactImpl();
- }
-
- public Artifact createArtifact() {
- return new ArtifactImpl();
- }
}
Added: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java?rev=616114&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java (added)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java Mon Jan 28 16:05:37 2008
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+package org.apache.tuscany.sca.contribution;
+
+/**
+ * Constants for the main supported contribution package types.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface PackageType {
+
+ /**
+ * Java compressed contribution package
+ */
+ String JAR = "application/x-compressed";
+
+ /**
+ * Filesystem folder contribution package
+ */
+ String FOLDER = "application/vnd.tuscany.folder";
+
+}
Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Workspace.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Workspace.java?rev=616114&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Workspace.java (added)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Workspace.java Mon Jan 28 16:05:37 2008
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+
+package org.apache.tuscany.sca.contribution;
+
+import java.util.List;
+
+/**
+ * A workspace containing contributions.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface Workspace extends Artifact {
+
+ List<Contribution> getContributions();
+
+}
Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Workspace.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Workspace.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java Mon Jan 28 16:05:37 2008
@@ -23,17 +23,17 @@
/**
- * Default implementation of the model representing an artifact.
+ * The model representing an artifact in a contribution.
*
* @version $Rev$ $Date$
*/
-public class ArtifactImpl implements Artifact {
+class ArtifactImpl implements Artifact {
private String uri;
private String location;
private Object model;
private boolean unresolved;
- public ArtifactImpl() {
+ ArtifactImpl() {
}
public String getLocation() {
Added: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java?rev=616114&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java (added)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java Mon Jan 28 16:05:37 2008
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+
+package org.apache.tuscany.sca.contribution.impl;
+
+import org.apache.tuscany.sca.contribution.Artifact;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.ContributionFactory;
+import org.apache.tuscany.sca.contribution.DeployedArtifact;
+import org.apache.tuscany.sca.contribution.Workspace;
+
+
+/**
+ * Default implementation of a contribution model factory.
+ *
+ * @version $Rev$ $Date$
+ */
+public class ContributionFactoryImpl implements ContributionFactory {
+
+ protected ContributionFactoryImpl() {
+ }
+
+ public Contribution createContribution() {
+ return new ContributionImpl();
+ }
+
+ public Artifact createArtifact() {
+ return new ArtifactImpl();
+ }
+
+ public Workspace createWorkspace() {
+ return new WorkspaceImpl();
+ }
+
+ @Deprecated
+ public DeployedArtifact createDeployedArtifact() {
+ class DeployedArtifactImpl extends ArtifactImpl implements DeployedArtifact {
+ }
+ return new DeployedArtifactImpl();
+ }
+}
Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java Mon Jan 28 16:05:37 2008
@@ -34,7 +34,7 @@
*
* @version $Rev$ $Date$
*/
-public class ContributionImpl implements Contribution {
+class ContributionImpl implements Contribution {
private String uri;
private String location;
private Object model;
@@ -48,7 +48,7 @@
// FIXME remove this dependency on Java classloaders
private ClassLoader classLoader;
- public ContributionImpl() {
+ ContributionImpl() {
}
public String getLocation() {
Added: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/WorkspaceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/WorkspaceImpl.java?rev=616114&view=auto
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/WorkspaceImpl.java (added)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/WorkspaceImpl.java Mon Jan 28 16:05:37 2008
@@ -0,0 +1,81 @@
+/*
+ * 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.
+ */
+
+package org.apache.tuscany.sca.contribution.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.Workspace;
+
+/**
+ * WorkspaceImpl
+ *
+ * @version $Rev$ $Date$
+ */
+class WorkspaceImpl implements Workspace {
+
+ private String location;
+ private String uri;
+ private boolean unresolved;
+ private List<Contribution> contributions = new ArrayList<Contribution>();
+
+ /**
+ * Constructs a new workspace.
+ */
+ WorkspaceImpl() {
+ }
+
+ public String getLocation() {
+ return location;
+ }
+
+ public Object getModel() {
+ return null;
+ }
+
+ public String getURI() {
+ return uri;
+ }
+
+ public void setLocation(String location) {
+ this.location = location;
+ }
+
+ public void setModel(Object model) {
+ }
+
+ public void setURI(String uri) {
+ this.uri = uri;
+ }
+
+ public boolean isUnresolved() {
+ return unresolved;
+ }
+
+ public void setUnresolved(boolean unresolved) {
+ this.unresolved = unresolved;
+ }
+
+ public List<Contribution> getContributions() {
+ return contributions;
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/WorkspaceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/WorkspaceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java Mon Jan 28 16:05:37 2008
@@ -22,7 +22,7 @@
import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
/**
- * Interface for extensions that can process contributions.
+ * Base interface for artifact processors.
*
* @version $Rev$ $Date$
*/
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java Mon Jan 28 16:05:37 2008
@@ -23,7 +23,7 @@
*
* @version $Rev$ $Date$
*/
-public interface ArtifactProcessorExtensionPoint<P extends ArtifactProcessor> {
+public interface ArtifactProcessorExtensionPoint<P extends ArtifactProcessor<?>> {
/**
* Add an artifact processor.
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java Mon Jan 28 16:05:37 2008
@@ -303,13 +303,13 @@
this(null, name, value);
}
- public XAttr(String uri, String name, List values) {
+ public XAttr(String uri, String name, List<?> values) {
this.uri = uri;
this.name = name;
this.value = values;
}
- public XAttr(String name, List values) {
+ public XAttr(String name, List<?> values) {
this(null, name, values);
}
@@ -410,7 +410,7 @@
} else if (value instanceof List) {
// Write a list of values
- List values = (List)value;
+ List<?> values = (List<?>)value;
if (values.isEmpty()) {
return;
}
@@ -474,7 +474,7 @@
} else if (value instanceof List) {
// Write prefixes for a list of values
- for (Object v: (List)value) {
+ for (Object v: (List<?>)value) {
if (v instanceof QName) {
// Write prefix for a QName value
writeQNamePrefix(writer, (QName)v);
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java Mon Jan 28 16:05:37 2008
@@ -22,7 +22,7 @@
import java.util.Map;
/**
- * The default implementation of an artifact processor registry.
+ * The default implementation of an artifact processor extension point.
*
* @version $Rev$ $Date$
*/
@@ -33,7 +33,7 @@
/**
* Constructs a new loader registry.
*/
- public DefaultArtifactProcessorExtensionPoint() {
+ DefaultArtifactProcessorExtensionPoint() {
}
/**
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java Mon Jan 28 16:05:37 2008
@@ -35,7 +35,7 @@
import org.apache.tuscany.sca.contribution.util.ServiceDiscovery;
/**
- * Default implementation of ContributionProcessorRegistry
+ * Default implementation of a package processor extension point.
*
* @version $Rev$ $Date$
*/
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java Mon Jan 28 16:05:37 2008
@@ -78,6 +78,13 @@
return super.getProcessor(artifactType);
}
+ /**
+ * Returns a QName object from a QName expressed as {ns}name
+ * or ns#name.
+ *
+ * @param qname
+ * @return
+ */
private static QName getQName(String qname) {
if (qname == null) {
return null;
@@ -97,6 +104,9 @@
throw new IllegalArgumentException("Invalid qname: "+qname);
}
+ /**
+ * Lazily load artifact processors registered in the extension point.
+ */
private void loadArtifactProcessors() {
if (loaded)
return;
@@ -145,7 +155,7 @@
private String factoryName;
private ServiceDeclaration processorDeclaration;
private StAXArtifactProcessor processor;
- private Class modelType;
+ private Class<?> modelType;
LazyStAXArtifactProcessor(ModelFactoryExtensionPoint modelFactories,
QName artifactType,
@@ -226,7 +236,7 @@
getProcessor().write(model, outputSource);
}
- public Class getModelType() {
+ public Class<?> getModelType() {
if (modelType == null) {
try {
modelType = processorDeclaration.loadClass(modelTypeName);
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java Mon Jan 28 16:05:37 2008
@@ -33,7 +33,7 @@
import org.apache.tuscany.sca.contribution.util.ServiceDiscovery;
/**
- * The default implementation of a StAX artifact processor registry.
+ * The default implementation of a URL artifact processor extension point.
*
* @version $Rev$ $Date$
*/
@@ -72,7 +72,10 @@
loadProcessors();
return super.getProcessor(artifactType);
}
-
+
+ /**
+ * Lazily load artifact processors registered in the extension point.
+ */
private void loadProcessors() {
if (loaded)
return;
@@ -110,7 +113,7 @@
private String modelTypeName;
private ServiceDeclaration processorDeclaration;
private URLArtifactProcessor processor;
- private Class modelType;
+ private Class<?> modelType;
LazyURLArtifactProcessor(ModelFactoryExtensionPoint modelFactories,
String artifactType,
@@ -144,7 +147,7 @@
return getProcessor().read(contributionURL, artifactURI, artifactURL);
}
- public Class getModelType() {
+ public Class<?> getModelType() {
if (modelType == null) {
try {
modelType = processorDeclaration.loadClass(modelTypeName);
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java Mon Jan 28 16:05:37 2008
@@ -47,7 +47,7 @@
*
* @version $Rev$ $Date$
*/
-public class DefaultValidatingXMLInputFactory extends ValidatingXMLInputFactory {
+public class DefaultValidatingXMLInputFactory extends XMLInputFactory {
private XMLInputFactory inputFactory;
private ValidationSchemaExtensionPoint schemas;
@@ -65,7 +65,11 @@
this.schemas = schemas;
}
- private void initialize() {
+ /**
+ * Initialize the registered schemas and create an aggregated schema for
+ * validation.
+ */
+ private void initializeSchemas() {
if (initialized) {
return;
}
@@ -133,32 +137,32 @@
}
public XMLStreamReader createXMLStreamReader(InputStream arg0, String arg1) throws XMLStreamException {
- initialize();
+ initializeSchemas();
return new ValidatingXMLStreamReader(inputFactory.createXMLStreamReader(arg0, arg1), aggregatedSchema);
}
public XMLStreamReader createXMLStreamReader(InputStream arg0) throws XMLStreamException {
- initialize();
+ initializeSchemas();
return new ValidatingXMLStreamReader(inputFactory.createXMLStreamReader(arg0), aggregatedSchema);
}
public XMLStreamReader createXMLStreamReader(Reader arg0) throws XMLStreamException {
- initialize();
+ initializeSchemas();
return new ValidatingXMLStreamReader(inputFactory.createXMLStreamReader(arg0), aggregatedSchema);
}
public XMLStreamReader createXMLStreamReader(Source arg0) throws XMLStreamException {
- initialize();
+ initializeSchemas();
return new ValidatingXMLStreamReader(inputFactory.createXMLStreamReader(arg0), aggregatedSchema);
}
public XMLStreamReader createXMLStreamReader(String arg0, InputStream arg1) throws XMLStreamException {
- initialize();
+ initializeSchemas();
return new ValidatingXMLStreamReader(inputFactory.createXMLStreamReader(arg0, arg1), aggregatedSchema);
}
public XMLStreamReader createXMLStreamReader(String arg0, Reader arg1) throws XMLStreamException {
- initialize();
+ initializeSchemas();
return new ValidatingXMLStreamReader(inputFactory.createXMLStreamReader(arg0, arg1), aggregatedSchema);
}
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java Mon Jan 28 16:05:37 2008
@@ -30,7 +30,7 @@
import org.apache.tuscany.sca.contribution.util.ServiceDiscovery;
/**
- * DefaultValidationSchemaExtensionPoint
+ * Default implementation of an extension point for XML schemas.
*
* @version $Rev$ $Date$
*/
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java Mon Jan 28 16:05:37 2008
@@ -31,20 +31,16 @@
import org.apache.tuscany.sca.contribution.service.UnsupportedContentTypeException;
/**
- * Default implementation of PackageProcessor.
+ * Implementation of an extensible package processor.
*
- * This implementation has a packageProcessorExtensionPoint
- * and it delegates to the proper package processor based on content type
+ * Takes a package processor extension point and delegates to the proper package
+ * processor from the extension point based on the package's content type.
*
* @version $Rev$ $Date$
*/
public class ExtensiblePackageProcessor implements PackageProcessor {
private PackageProcessorExtensionPoint processors;
-
- /**
- * Helper method to describe contentType for each artifact
- */
private TypeDescriber packageTypeDescriber;
public ExtensiblePackageProcessor(PackageProcessorExtensionPoint processors, TypeDescriber packageTypeDescriber) {
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java Mon Jan 28 16:05:37 2008
@@ -39,10 +39,10 @@
import org.apache.tuscany.sca.contribution.service.UnrecognizedElementException;
/**
- * The default implementation of a StAX artifact processor registry.
+ * Implementation of an extensible StAX artifact processor.
*
- * This implementation has a StAXArtifactProcessorExtensionPoint and
- * it delegates to the proper StAXArtifactProcessor by element QName
+ * Takes a StAXArtifactProcessorExtensionPoint and delegates to the proper
+ * StAXArtifactProcessor by element QName
*
* @version $Rev$ $Date$
*/
@@ -55,7 +55,8 @@
private StAXArtifactProcessorExtensionPoint processors;
/**
- * Constructs a new loader registry.
+ * Constructs a new ExtensibleStAXArtifactProcessor.
+ * @param processors
* @param inputFactory
* @param outputFactory
*/
@@ -117,7 +118,7 @@
* @return The model
* @throws ContributionReadException
*/
- public <MO> MO read(InputStream is, Class<MO> type) throws ContributionReadException {
+ public <M> M read(InputStream is, Class<M> type) throws ContributionReadException {
try {
XMLStreamReader reader;
try {
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java Mon Jan 28 16:05:37 2008
@@ -27,10 +27,10 @@
import org.apache.tuscany.sca.contribution.service.UnrecognizedElementException;
/**
- * The default implementation of a URL artifact processor.
+ * Implementation of an extensible URL artifact processor.
*
- * This implementation has a URLArtifactProcessorExtensionPoint and
- * it delegate to the proper URLArtifactProcessor by either fileName or fileExtention
+ * Takes a URLArtifactProcessorExtensionPoint and delegates to the proper URLArtifactProcessor
+ * by either fileName or fileExtention
*
* @version $Rev$ $Date$
*/
@@ -40,7 +40,7 @@
private URLArtifactProcessorExtensionPoint processors;
/**
- * Constructs a new URL artifact processor.
+ * Constructs a new ExtensibleURLArtifactProcessor.
*
* @param processors
*/
@@ -88,7 +88,7 @@
}
}
- public <MO> MO read(URL contributionURL, URI artifactURI, URL artifactUrl, Class<MO> type)
+ public <M> M read(URL contributionURL, URI artifactURI, URL artifactUrl, Class<M> type)
throws ContributionReadException {
Object mo = read(contributionURL, artifactURI, artifactUrl);
if (type.isInstance(mo)) {
@@ -107,12 +107,13 @@
public Class<Object> getModelType() {
return null;
}
-
+
/**
- * Utility functions
+ * Returns the file name from a URL.
+ * @param url
+ * @return
*/
-
- private String getFileName(URL url){
+ private static String getFileName(URL url){
String fileName = url.getPath();
int pos = fileName.lastIndexOf("/");
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java Mon Jan 28 16:05:37 2008
@@ -28,8 +28,10 @@
import org.apache.tuscany.sca.contribution.service.ContributionException;
/**
- * Contribution package processors
- * These processors understand the internal format of the contribution and how to process the artifacts
+ * Interface for contribution package processors
+ *
+ * Package processors understand the format of the contribution and how to get the
+ * artifacts in the contribution.
*
* @version $Rev$ $Date$
*/
@@ -43,7 +45,7 @@
String getPackageType();
/**
- * Retrieve a list of artifacts for the specific package type
+ * Returns a list of artifacts in the contribution.
*
* @param packageSourceURL Contribution package location URL
* @param inputStream Optional content of the package
@@ -55,8 +57,9 @@
/**
* Return the URL for an artifact in the package.
- * This is needed in the case of special archives such as jar files that have special
- * URL structure for internal artifacts
+ *
+ * This is needed for archives such as jar files that have specific URL schemes
+ * for the artifacts they contain.
*
* @param packageSourceURL Contribution package location URL
* @param artifact The relative URI for the artifact
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java Mon Jan 28 16:05:37 2008
@@ -26,14 +26,14 @@
public interface PackageProcessorExtensionPoint {
/**
- * Register a PackageProcessor using the package type as the key
+ * Register a PackageProcessor using the package type as the key.
*
* @param processor The package processor
*/
void addPackageProcessor(PackageProcessor processor);
/**
- * Unregister a PackageProcessor
+ * Unregister a PackageProcessor.
*
* @param processor The package processor
*/
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java Mon Jan 28 16:05:37 2008
@@ -19,7 +19,7 @@
package org.apache.tuscany.sca.contribution.processor;
/**
- * A registry for StAX artifact processors.
+ * An extension point for StAX artifact processors.
*
* @version $Rev$ $Date$
*/
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java Mon Jan 28 16:05:37 2008
@@ -25,7 +25,7 @@
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
/**
- * An artifact processor that can read models from an InputStream.
+ * An artifact processor that can read models from a URL.
*
* @version $Rev$ $Date$
*/
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java Mon Jan 28 16:05:37 2008
@@ -19,7 +19,7 @@
package org.apache.tuscany.sca.contribution.processor;
/**
- * A registry for Document artifact processors.
+ * An extension point for URL artifact processors.
*
* @version $Rev$ $Date$
*/
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java Mon Jan 28 16:05:37 2008
@@ -49,14 +49,21 @@
private int level;
private ValidatorHandler handler;
- public ValidatingXMLStreamReader(XMLStreamReader reader, Schema schema) throws XMLStreamException {
+ /**
+ * Constructs a new ValidatingXMLStreamReader.
+ *
+ * @param reader
+ * @param schema
+ * @throws XMLStreamException
+ */
+ ValidatingXMLStreamReader(XMLStreamReader reader, Schema schema) throws XMLStreamException {
super(reader);
if (schema == null) {
return;
}
handler = schema.newValidatorHandler();
- handler.setDocumentLocator(new LocatorAdaptor());
+ handler.setDocumentLocator(new LocatorAdapter());
try {
handler.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
} catch (SAXException e) {
@@ -201,6 +208,11 @@
}
}
+ /**
+ * Handle a start element event.
+ *
+ * @throws SAXException
+ */
private void handleStartElement() throws SAXException {
// send startPrefixMapping events immediately before startElement event
@@ -226,6 +238,11 @@
handler.startElement(qname.getNamespaceURI(), qname.getLocalPart(), rawname, attrs);
}
+ /**
+ * Handle an endElement event.
+ *
+ * @throws SAXException
+ */
private void handleEndElement() throws SAXException {
// fire endElement
@@ -288,11 +305,11 @@
}
/**
- * Adaptor for mapping Locator information.
+ * Adapter for mapping Locator information.
*/
- private final class LocatorAdaptor implements Locator {
+ private final class LocatorAdapter implements Locator {
- private LocatorAdaptor() {
+ private LocatorAdapter() {
}
public int getColumnNumber() {
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java Mon Jan 28 16:05:37 2008
@@ -36,22 +36,28 @@
private final ModelResolverExtensionPoint resolvers;
private final ModelFactoryExtensionPoint factories;
private final Contribution contribution;
+ private final ModelResolver defaultResolver;
private final Map<Class<?>, ModelResolver> resolverInstances = new HashMap<Class<?>, ModelResolver>();
private Map<Object, Object> map = new HashMap<Object, Object>();
- private ModelResolver domainResolver = null;
/**
* Constructs an extensible model resolver
*
* @param resolvers
* @param contribution
+ * @param factories
*/
public ExtensibleModelResolver(Contribution contribution,
ModelResolverExtensionPoint resolvers,
- ModelFactoryExtensionPoint factories) {
+ ModelFactoryExtensionPoint factories,
+ ModelResolver defaultResolver) {
this.contribution = contribution;
this.resolvers = resolvers;
this.factories = factories;
+ //FIXME Remove this default resolver, this is currently used to resolve policy declarations
+ // but they should be handled by the contribution import/export mechanism instead of this
+ // defaultResolver hack.
+ this.defaultResolver = defaultResolver;
}
/**
@@ -126,12 +132,16 @@
if (resolver != null) {
return resolver.resolveModel(modelClass, unresolved);
} else {
- if (domainResolver != null) {
- Object resolved = domainResolver.resolveModel(modelClass, unresolved);
+ //FIXME Remove this default resolver, this is currently used to resolve policy declarations
+ // but they should be handled by the contribution import/export mechanism instead of this
+ // defaultResolver hack.
+ if (defaultResolver != null) {
+ Object resolved = defaultResolver.resolveModel(modelClass, unresolved);
if (resolved != null && resolved != unresolved) {
return modelClass.cast(resolved);
}
}
+
Object resolved = map.get(unresolved);
if (resolved != null) {
// Return the resolved object
@@ -142,11 +152,4 @@
return unresolved;
}
- public ModelResolver getDomainResolver() {
- return domainResolver;
- }
-
- public void setDomainResolver(ModelResolver domainResolver) {
- this.domainResolver = domainResolver;
- }
}
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java Mon Jan 28 16:05:37 2008
@@ -20,7 +20,10 @@
package org.apache.tuscany.sca.contribution.resolver;
/**
- * SCA Assemblies reference many artifacts of a wide variety of types. These
+ * A model resolver, responsible for resolving models in the scope of an
+ * SCA contribution.
+ *
+ * SCA Assemblies reference artifacts of a wide variety of types. These
* include:
* <ul>
* <li> Reference from one SCA composite to another SCA composite
@@ -30,10 +33,10 @@
* <li> Reference to any of a wide variety of implementation artifact files,
* including Java classes, BPEL scripts, C++ DLLs and classes, PHP scripts
* </ul>
+ *
* In the SCA assemblies, these various artifacts are referenced using either
- * QNames or URIs that do not point to a specific entity. Resolution of these
- * references to concrete artifacts is necessary as part of the operation of the
- * SCA domain.
+ * QNames or logical URIs. Model resolvers are used to resolve these references
+ * and get the in-memory models representing the referenced artifacts.
*
* @version $Rev$ $Date$
*/
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java Mon Jan 28 16:05:37 2008
@@ -21,29 +21,29 @@
/**
- * An extension point for Model Resolvers
+ * An extension point for model resolvers
*
* @version $Rev$ $Date$
*/
public interface ModelResolverExtensionPoint {
/**
- * Register a Model Resolver Class using the Artifact Type as the key
+ * Register a model resolver class using the model type as the key
*
- * @param modelType The model artifact type
+ * @param modelType The model type
* @param resolver The model resolver Class
*/
void addResolver(Class<?> modelType, Class <? extends ModelResolver> resolver);
/**
- * Remove the Model Resolver Class for a specific Artifact Type
+ * Remove the model resolver class for a specific model type
*
- * @param modelType The model artifact type
+ * @param modelType The model type
*/
void removeResolver(Class<?> modelType);
/**
- * Retrieve a Model Resolver Class for a specific Artifact Type
+ * Retrieve a model resolver class for a specific model type
*
* @param modelType The model artifact type
* @return The model resolver Class
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java Mon Jan 28 16:05:37 2008
@@ -24,6 +24,8 @@
/**
* A resource URL, which should be used to register resources
* with an ArtifactResolver and resolve these resources later.
+ *
+ * FIXME Don't use as its deprecated, use Artifact instead.
*/
@Deprecated
public class ResourceReference {
Modified: incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java Mon Jan 28 16:05:37 2008
@@ -61,16 +61,6 @@
* Construct a new (sca) definitions processor
* @param policyFactory
* @param extensionProcessor
- */
- public SCADefinitionsProcessor(PolicyFactory policyFactory,
- StAXArtifactProcessor<Object> extensionProcessor) {
- this.extensionProcessor = extensionProcessor;
- }
-
- /**
- * Construct a new (sca) definitions processor
- * @param policyFactory
- * @param extensionProcessor
* @param modelResolver
*/
public SCADefinitionsProcessor(PolicyFactory policyFactory,
@@ -108,10 +98,7 @@
definitions.getImplementationTypes().add((IntentAttachPointType)extension);
}
}
-
- if ( getDefinitionsResolver() != null ) {
- getDefinitionsResolver().addModel(extension);
- }
+ definitionsResolver.addModel(extension);
}
break;
}
@@ -186,11 +173,4 @@
return SCADefinitions.class;
}
- public ModelResolver getDefinitionsResolver() {
- return definitionsResolver;
- }
-
- public void setDefinitionsResolver(ModelResolver definitionsResolver) {
- this.definitionsResolver = definitionsResolver;
- }
}
Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java?rev=616114&r1=616113&r2=616114&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/AbstractWSDLTestCase.java Mon Jan 28 16:05:37 2008
@@ -60,7 +60,7 @@
javax.wsdl.factory.WSDLFactory wsdl4jFactory = javax.wsdl.factory.WSDLFactory.newInstance();
factories.addFactory(wsdlFactory);
factories.addFactory(wsdl4jFactory);
- resolver = new ExtensibleModelResolver(contribution, modelResolvers, factories);
+ resolver = new ExtensibleModelResolver(contribution, modelResolvers, factories, null);
contribution.setModelResolver(resolver);
modelResolvers.addResolver(WSDLDefinition.class, WSDLModelResolver.class);
modelResolvers.addResolver(XSDefinition.class, XSDModelResolver.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org