You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/10/15 00:06:33 UTC
svn commit: r704715 [2/2] - in /tuscany/branches/sca-equinox:
itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/
itest/validation/src/test/java/domain/
modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/
modules/assem...
Copied: tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderExtensionPoint.java (from r704290, tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderExtensionPoint.java?p2=tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderExtensionPoint.java&p1=tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java&r1=704290&r2=704715&rev=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java (original)
+++ tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderExtensionPoint.java Tue Oct 14 15:06:31 2008
@@ -27,9 +27,9 @@
*
* @version $Rev$ $Date$
*/
-public interface SCADefinitionsProviderExtensionPoint {
+public interface DefinitionsProviderExtensionPoint {
- void addSCADefinitionsProvider(SCADefinitionsProvider provider);
- void removeSCADefinitionsProvider(SCADefinitionsProvider provider);
- List<SCADefinitionsProvider> getSCADefinitionsProviders();
+ void addDefinitionsProvider(DefinitionsProvider provider);
+ void removeDefinitionsProvider(DefinitionsProvider provider);
+ List<DefinitionsProvider> getDefinitionsProviders();
}
Propchange: tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderExtensionPoint.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderExtensionPoint.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-equinox/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefinitionsProviderExtensionPoint.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 14 15:06:31 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java:671193
+/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java:694855
Copied: tuscany/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProviderExtensionPoint (from r704290, tuscany/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProviderExtensionPoint?p2=tuscany/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProviderExtensionPoint&p1=tuscany/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint&r1=704290&r2=704715&rev=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint (original)
+++ tuscany/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProviderExtensionPoint Tue Oct 14 15:06:31 2008
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-org.apache.tuscany.sca.provider.DefaultSCADefinitionsProviderExtensionPoint
+org.apache.tuscany.sca.provider.DefaultDefinitionsProviderExtensionPoint
\ No newline at end of file
Propchange: tuscany/branches/sca-equinox/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProviderExtensionPoint
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 14 15:06:31 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint:671193
+/tuscany/java/sca/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint:694855
Copied: tuscany/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java (from r704653, tuscany/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java?p2=tuscany/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java&p1=tuscany/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java&r1=704653&r2=704715&rev=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java (original)
+++ tuscany/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java Tue Oct 14 15:06:31 2008
@@ -27,6 +27,8 @@
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
+import java.util.HashMap;
+import java.util.Map;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
@@ -40,19 +42,22 @@
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.definitions.DefinitionsFactory;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.definitions.util.SCADefinitionsUtil;
+import org.apache.tuscany.sca.definitions.util.DefinitionsUtil;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.Problem.Severity;
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.IntentAttachPointType;
+import org.apache.tuscany.sca.policy.PolicySet;
/**
* A SCA Definitions Document processor.
*
* @version $Rev$ $Date$
*/
-public class SCADefinitionsDocumentProcessor implements URLArtifactProcessor<SCADefinitions> {
+public class DefinitionsDocumentProcessor implements URLArtifactProcessor<Definitions> {
private StAXArtifactProcessor<Object> extensionProcessor;
private XMLInputFactory inputFactory;
private DefinitionsFactory definitionsFactory;
@@ -67,7 +72,7 @@
* @param policyFactory
* @param staxProcessor
*/
- public SCADefinitionsDocumentProcessor(StAXArtifactProcessor<Object> staxProcessor,
+ public DefinitionsDocumentProcessor(StAXArtifactProcessor<Object> staxProcessor,
XMLInputFactory inputFactory,
DefinitionsFactory definitionsFactory,
Monitor monitor) {
@@ -83,7 +88,7 @@
* @param modelFactories
* @param staxProcessor
*/
- public SCADefinitionsDocumentProcessor(FactoryExtensionPoint modelFactories,
+ public DefinitionsDocumentProcessor(FactoryExtensionPoint modelFactories,
StAXArtifactProcessor<Object> staxProcessor,
Monitor monitor) {
this.extensionProcessor = (StAXArtifactProcessor<Object>)staxProcessor;
@@ -132,7 +137,7 @@
}
}
- public SCADefinitions read(URL contributionURL, final URI uri, final URL url) throws ContributionReadException {
+ public Definitions read(URL contributionURL, final URI uri, final URL url) throws ContributionReadException {
InputStream urlStream = null;
try {
// Allow privileged access to open URL stream. Add FilePermission to added to security
@@ -153,7 +158,7 @@
//urlStream = createInputStream(url);
XMLStreamReader reader = inputFactory.createXMLStreamReader(url.toString(), urlStream);
- SCADefinitions definitions = definitionsFactory.createDefinitions();
+ Definitions definitions = definitionsFactory.createDefinitions();
QName name = null;
int event;
while (reader.hasNext()) {
@@ -166,8 +171,8 @@
return definitions;
}
} else {
- SCADefinitions aDefn = (SCADefinitions)extensionProcessor.read(reader);
- SCADefinitionsUtil.aggregateSCADefinitions(aDefn, definitions);
+ Definitions aDefn = (Definitions)extensionProcessor.read(reader);
+ DefinitionsUtil.aggregate(aDefn, definitions);
}
}
}
@@ -193,9 +198,40 @@
}
}
}
+
+ private static void stripDuplicates(Definitions scaDefns) {
+ Map<QName, Intent> definedIntents = new HashMap<QName, Intent>();
+ for (Intent intent : scaDefns.getIntents()) {
+ definedIntents.put(intent.getName(), intent);
+ }
+
+ Map<QName, PolicySet> definedPolicySets = new HashMap<QName, PolicySet>();
+ for (PolicySet policySet : scaDefns.getPolicySets()) {
+ definedPolicySets.put(policySet.getName(), policySet);
+ }
+
+ Map<QName, IntentAttachPointType> definedBindingTypes = new HashMap<QName, IntentAttachPointType>();
+ for (IntentAttachPointType bindingType : scaDefns.getBindingTypes()) {
+ definedBindingTypes.put(bindingType.getName(), bindingType);
+ }
+
+ Map<QName, IntentAttachPointType> definedImplTypes = new HashMap<QName, IntentAttachPointType>();
+ for (IntentAttachPointType implType : scaDefns.getImplementationTypes()) {
+ definedImplTypes.put(implType.getName(), implType);
+ }
+
+ scaDefns.getIntents().clear();
+ scaDefns.getIntents().addAll(definedIntents.values());
+ scaDefns.getPolicySets().clear();
+ scaDefns.getPolicySets().addAll(definedPolicySets.values());
+ scaDefns.getBindingTypes().clear();
+ scaDefns.getBindingTypes().addAll(definedBindingTypes.values());
+ scaDefns.getImplementationTypes().clear();
+ scaDefns.getImplementationTypes().addAll(definedImplTypes.values());
+ }
- public void resolve(SCADefinitions scaDefinitions, ModelResolver resolver) throws ContributionResolveException {
- SCADefinitionsUtil.stripDuplicates(scaDefinitions);
+ public void resolve(Definitions scaDefinitions, ModelResolver resolver) throws ContributionResolveException {
+ stripDuplicates(scaDefinitions);
extensionProcessor.resolve(scaDefinitions, resolver);
}
@@ -203,8 +239,8 @@
return "definitions.xml";
}
- public Class<SCADefinitions> getModelType() {
- return SCADefinitions.class;
+ public Class<Definitions> getModelType() {
+ return Definitions.class;
}
}
Propchange: tuscany/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
------------------------------------------------------------------------------
eol-style = native
Propchange: tuscany/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: tuscany/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java (from r704653, tuscany/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java?p2=tuscany/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java&p1=tuscany/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java&r1=704653&r2=704715&rev=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java (original)
+++ tuscany/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java Tue Oct 14 15:06:31 2008
@@ -40,7 +40,7 @@
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.apache.tuscany.sca.definitions.DefinitionsFactory;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.policy.Intent;
import org.apache.tuscany.sca.policy.IntentAttachPointType;
@@ -53,7 +53,7 @@
*
* @version $Rev$ $Date$
*/
-public class SCADefinitionsProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<SCADefinitions> {
+public class DefinitionsProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<Definitions> {
private StAXArtifactProcessor<Object> extensionProcessor;
private DefinitionsFactory definitionsFactory;
@@ -67,7 +67,7 @@
public static final String TARGET_NAMESPACE = "targetNamespace";
public static final String NAME = "name";
- public SCADefinitionsProcessor(FactoryExtensionPoint factoryExtensionPoint,
+ public DefinitionsProcessor(FactoryExtensionPoint factoryExtensionPoint,
StAXArtifactProcessor<Object> extensionProcessor,
Monitor monitor) {
this.extensionProcessor = extensionProcessor;
@@ -75,9 +75,9 @@
this.definitionsFactory = factoryExtensionPoint.getFactory(DefinitionsFactory.class);
}
- public SCADefinitions read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
+ public Definitions read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
QName name = null;
- SCADefinitions definitions = null;
+ Definitions definitions = null;
String targetNamespace = null;
while (reader.hasNext()) {
@@ -105,7 +105,7 @@
// FIXME: Workaround for TUSCANY-2499
intent.setUnresolved(false);
- definitions.getPolicyIntents().add(intent);
+ definitions.getIntents().add(intent);
} else if (extension instanceof PolicySet) {
PolicySet policySet = (PolicySet)extension;
policySet.setName(new QName(targetNamespace, policySet.getName().getLocalPart()));
@@ -145,13 +145,13 @@
return definitions;
}
- public void write(SCADefinitions definitions, XMLStreamWriter writer) throws ContributionWriteException,
+ public void write(Definitions definitions, XMLStreamWriter writer) throws ContributionWriteException,
XMLStreamException {
writeStartDocument(writer, SCA10_NS, SCA_DEFINITIONS, new XAttr(TARGET_NAMESPACE, definitions
.getTargetNamespace()));
- for (Intent policyIntent : definitions.getPolicyIntents()) {
+ for (Intent policyIntent : definitions.getIntents()) {
extensionProcessor.write(policyIntent, writer);
}
@@ -170,7 +170,7 @@
writeEndDocument(writer);
}
- public void resolve(SCADefinitions scaDefns, ModelResolver resolver) throws ContributionResolveException {
+ public void resolve(Definitions scaDefns, ModelResolver resolver) throws ContributionResolveException {
// start by adding all of the top level artifacts into the resolver as there
// are many cross artifact references in a definitions file and we don't want
// to be dependent on the order things appear
@@ -181,7 +181,7 @@
List<PolicySet> simplePolicySets = new ArrayList<PolicySet>();
List<PolicySet> referredPolicySets = new ArrayList<PolicySet>();
- for (Intent policyIntent : scaDefns.getPolicyIntents()) {
+ for (Intent policyIntent : scaDefns.getIntents()) {
if (policyIntent instanceof ProfileIntent)
profileIntents.add((ProfileIntent)policyIntent);
else if (policyIntent instanceof QualifiedIntent)
@@ -242,8 +242,8 @@
return SCA_DEFINITIONS_QNAME;
}
- public Class<SCADefinitions> getModelType() {
- return SCADefinitions.class;
+ public Class<Definitions> getModelType() {
+ return Definitions.class;
}
}
Propchange: tuscany/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
------------------------------------------------------------------------------
eol-style = native
Propchange: tuscany/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: tuscany/branches/sca-equinox/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ tuscany/branches/sca-equinox/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Tue Oct 14 15:06:31 2008
@@ -16,4 +16,4 @@
# under the License.
# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.definitions.xml.SCADefinitionsProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#definitions,model=org.apache.tuscany.sca.definitions.SCADefinitions
+org.apache.tuscany.sca.definitions.xml.DefinitionsProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#definitions,model=org.apache.tuscany.sca.definitions.Definitions
Modified: tuscany/branches/sca-equinox/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor (original)
+++ tuscany/branches/sca-equinox/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor Tue Oct 14 15:06:31 2008
@@ -16,4 +16,4 @@
# under the License.
# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.definitions.xml.SCADefinitionsDocumentProcessor;type=definitions.xml,model=org.apache.tuscany.sca.definitions.SCADefinitions
+org.apache.tuscany.sca.definitions.xml.DefinitionsDocumentProcessor;type=definitions.xml,model=org.apache.tuscany.sca.definitions.Definitions
Modified: tuscany/branches/sca-equinox/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java (original)
+++ tuscany/branches/sca-equinox/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java Tue Oct 14 15:06:31 2008
@@ -53,8 +53,8 @@
*/
public class ReadDocumentTestCase {
- private static URLArtifactProcessor<SCADefinitions> policyDefinitionsProcessor = null;
- private static SCADefinitions definitions;
+ private static URLArtifactProcessor<Definitions> policyDefinitionsProcessor = null;
+ private static Definitions definitions;
private static Map<QName, Intent> intentTable = new Hashtable<QName, Intent>();
private static Map<QName, PolicySet> policySetTable = new Hashtable<QName, PolicySet>();
private static Map<QName, IntentAttachPointType> bindingTypesTable = new Hashtable<QName, IntentAttachPointType>();
@@ -85,13 +85,13 @@
staxProcessors.addArtifactProcessor(new TestPolicyProcessor());
URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
- policyDefinitionsProcessor = documentProcessors.getProcessor(SCADefinitions.class);
+ policyDefinitionsProcessor = documentProcessors.getProcessor(Definitions.class);
URL url = ReadDocumentTestCase.class.getResource("test_definitions.xml");
URI uri = URI.create("test_definitions.xml");
definitions = policyDefinitionsProcessor.read(null, uri, url);
- for ( Intent intent : definitions.getPolicyIntents() ) {
+ for ( Intent intent : definitions.getIntents() ) {
intentTable.put(intent.getName(), intent);
}
Modified: tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java (original)
+++ tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java Tue Oct 14 15:06:31 2008
@@ -18,15 +18,15 @@
*/
package org.apache.tuscany.sca.definitions;
-import org.apache.tuscany.sca.definitions.impl.SCADefinitionsImpl;
+import org.apache.tuscany.sca.definitions.impl.DefinitionsImpl;
/**
* Default Implementation of DefinitionsFactory
*/
public class DefaultDefinitionsFactory implements DefinitionsFactory {
- public SCADefinitions createDefinitions() {
- return new SCADefinitionsImpl();
+ public Definitions createDefinitions() {
+ return new DefinitionsImpl();
}
}
Copied: tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java (from r704290, tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java?p2=tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java&p1=tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java&r1=704290&r2=704715&rev=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java (original)
+++ tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java Tue Oct 14 15:06:31 2008
@@ -30,7 +30,7 @@
*
* @version $Rev$ $Date$
*/
-public interface SCADefinitions {
+public interface Definitions {
/**
* Returns the target namespace for this SCA Definition
* @return the target namespace
@@ -49,7 +49,7 @@
*
* @return a list of domain wide Policy Intents
*/
- List<Intent> getPolicyIntents();
+ List<Intent> getIntents();
/**
* Returns a list of domain wide PolicySets
Propchange: tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
------------------------------------------------------------------------------
eol-style = native
Propchange: tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 14 15:06:31 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java:671193
+/tuscany/java/sca/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java:694855
Copied: tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java (from r704290, tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java?p2=tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java&p1=tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java&r1=704290&r2=704715&rev=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java (original)
+++ tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java Tue Oct 14 15:06:31 2008
@@ -24,11 +24,11 @@
*
* @version $Rev$ $Date$
*/
-public interface SCADefinitionsBuilder {
+public interface DefinitionsBuilder {
/**
* Builds the SCA definitions
*
* @param scaDefns
*/
- void build(SCADefinitions scaDefns) throws SCADefinitionsBuilderException;
+ void build(Definitions scaDefns) throws DefinitionsBuilderException;
}
Propchange: tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java
------------------------------------------------------------------------------
eol-style = native
Propchange: tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 14 15:06:31 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java:671193
+/tuscany/java/sca/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java:694855
Copied: tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java (from r704290, tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java?p2=tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java&p1=tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java&r1=704290&r2=704715&rev=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java (original)
+++ tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java Tue Oct 14 15:06:31 2008
@@ -23,21 +23,21 @@
*
* @version $Rev$ $Date$
*/
-public class SCADefinitionsBuilderException extends Exception {
+public class DefinitionsBuilderException extends Exception {
private static final long serialVersionUID = 2513219325230252783L;
- public SCADefinitionsBuilderException() {
+ public DefinitionsBuilderException() {
}
- public SCADefinitionsBuilderException(String message) {
+ public DefinitionsBuilderException(String message) {
super(message);
}
- public SCADefinitionsBuilderException(Throwable cause) {
+ public DefinitionsBuilderException(Throwable cause) {
super(cause);
}
- public SCADefinitionsBuilderException(String message, Throwable cause) {
+ public DefinitionsBuilderException(String message, Throwable cause) {
super(message, cause);
}
}
Propchange: tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java
------------------------------------------------------------------------------
eol-style = native
Propchange: tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 14 15:06:31 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java:671193
+/tuscany/java/sca/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java:694855
Copied: tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderImpl.java (from r704290, tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderImpl.java?p2=tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderImpl.java&p1=tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java&r1=704290&r2=704715&rev=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderImpl.java Tue Oct 14 15:06:31 2008
@@ -37,11 +37,11 @@
*
* @version $Rev$ $Date$
*/
-public class SCADefinitionsBuilderImpl implements SCADefinitionsBuilder {
+public class DefinitionsBuilderImpl implements DefinitionsBuilder {
- public void build(SCADefinitions scaDefns) throws SCADefinitionsBuilderException {
+ public void build(Definitions scaDefns) throws DefinitionsBuilderException {
Map<QName, Intent> definedIntents = new HashMap<QName, Intent>();
- for (Intent intent : scaDefns.getPolicyIntents()) {
+ for (Intent intent : scaDefns.getIntents()) {
definedIntents.put(intent.getName(), intent);
}
@@ -62,12 +62,12 @@
//filling up the maps removes all duplicate entries... so fill this unique lists
//into the scaDefns.
- scaDefns.getPolicyIntents().clear();
+ scaDefns.getIntents().clear();
scaDefns.getPolicySets().clear();
scaDefns.getBindingTypes().clear();
scaDefns.getImplementationTypes().clear();
- scaDefns.getPolicyIntents().addAll(definedIntents.values());
+ scaDefns.getIntents().addAll(definedIntents.values());
scaDefns.getPolicySets().addAll(definedPolicySets.values());
scaDefns.getBindingTypes().addAll(definedBindingTypes.values());
scaDefns.getImplementationTypes().addAll(definedImplTypes.values());
@@ -78,9 +78,9 @@
buildImplementationTypes(scaDefns, definedImplTypes, definedIntents);
}
- private void buildBindingTypes(SCADefinitions scaDefns,
+ private void buildBindingTypes(Definitions scaDefns,
Map<QName, IntentAttachPointType> definedBindingTypes,
- Map<QName, Intent> definedIntents) throws SCADefinitionsBuilderException {
+ Map<QName, Intent> definedIntents) throws DefinitionsBuilderException {
for (IntentAttachPointType bindingType : scaDefns.getBindingTypes()) {
buildAlwaysProvidedIntents(bindingType, definedIntents);
buildMayProvideIntents(bindingType, definedIntents);
@@ -88,9 +88,9 @@
}
- private void buildImplementationTypes(SCADefinitions scaDefns,
+ private void buildImplementationTypes(Definitions scaDefns,
Map<QName, IntentAttachPointType> definedImplTypes,
- Map<QName, Intent> definedIntents) throws SCADefinitionsBuilderException {
+ Map<QName, Intent> definedIntents) throws DefinitionsBuilderException {
for (IntentAttachPointType implType : scaDefns.getImplementationTypes()) {
buildAlwaysProvidedIntents(implType, definedIntents);
buildMayProvideIntents(implType, definedIntents);
@@ -98,9 +98,9 @@
}
- private void buildPolicyIntents(SCADefinitions scaDefns, Map<QName, Intent> definedIntents)
- throws SCADefinitionsBuilderException {
- for (Intent policyIntent : scaDefns.getPolicyIntents()) {
+ private void buildPolicyIntents(Definitions scaDefns, Map<QName, Intent> definedIntents)
+ throws DefinitionsBuilderException {
+ for (Intent policyIntent : scaDefns.getIntents()) {
if (policyIntent instanceof ProfileIntent) {
buildProfileIntent((ProfileIntent)policyIntent, definedIntents);
}
@@ -111,9 +111,9 @@
}
}
- private void buildPolicySets(SCADefinitions scaDefns,
+ private void buildPolicySets(Definitions scaDefns,
Map<QName, PolicySet> definedPolicySets,
- Map<QName, Intent> definedIntents) throws SCADefinitionsBuilderException {
+ Map<QName, Intent> definedIntents) throws DefinitionsBuilderException {
for (PolicySet policySet : scaDefns.getPolicySets()) {
buildProvidedIntents(policySet, definedIntents);
@@ -129,7 +129,7 @@
}
private void buildProfileIntent(ProfileIntent policyIntent, Map<QName, Intent> definedIntents)
- throws SCADefinitionsBuilderException {
+ throws DefinitionsBuilderException {
//FIXME: Need to check for cyclic references first i.e an A requiring B and then B requiring A...
if (policyIntent != null) {
//resolve all required intents
@@ -140,7 +140,7 @@
if (resolvedRequiredIntent != null) {
requiredIntents.add(resolvedRequiredIntent);
} else {
- throw new SCADefinitionsBuilderException("Required Intent - " + requiredIntent
+ throw new DefinitionsBuilderException("Required Intent - " + requiredIntent
+ " not found for ProfileIntent "
+ policyIntent);
@@ -155,7 +155,7 @@
}
private void buildQualifiedIntent(QualifiedIntent policyIntent, Map<QName, Intent> definedIntents)
- throws SCADefinitionsBuilderException {
+ throws DefinitionsBuilderException {
if (policyIntent != null) {
//resolve the qualifiable intent
Intent qualifiableIntent = policyIntent.getQualifiableIntent();
@@ -165,7 +165,7 @@
if (resolvedQualifiableIntent != null) {
policyIntent.setQualifiableIntent(resolvedQualifiableIntent);
} else {
- throw new SCADefinitionsBuilderException("Qualifiable Intent - " + qualifiableIntent
+ throw new DefinitionsBuilderException("Qualifiable Intent - " + qualifiableIntent
+ " not found for QualifiedIntent "
+ policyIntent);
}
@@ -176,7 +176,7 @@
private void buildAlwaysProvidedIntents(IntentAttachPointType extensionType,
- Map<QName, Intent> definedIntents) throws SCADefinitionsBuilderException {
+ Map<QName, Intent> definedIntents) throws DefinitionsBuilderException {
if (extensionType != null) {
// resolve all provided intents
List<Intent> alwaysProvided = new ArrayList<Intent>();
@@ -186,7 +186,7 @@
if (resolvedProvidedIntent != null) {
alwaysProvided.add(resolvedProvidedIntent);
} else {
- throw new SCADefinitionsBuilderException(
+ throw new DefinitionsBuilderException(
"Always Provided Intent - " + providedIntent
+ " not found for ExtensionType "
+ extensionType);
@@ -202,7 +202,7 @@
}
private void buildMayProvideIntents(IntentAttachPointType extensionType,
- Map<QName, Intent> definedIntents) throws SCADefinitionsBuilderException {
+ Map<QName, Intent> definedIntents) throws DefinitionsBuilderException {
if (extensionType != null) {
// resolve all provided intents
List<Intent> mayProvide = new ArrayList<Intent>();
@@ -212,7 +212,7 @@
if (resolvedProvidedIntent != null) {
mayProvide.add(resolvedProvidedIntent);
} else {
- throw new SCADefinitionsBuilderException(
+ throw new DefinitionsBuilderException(
"May Provide Intent - " + providedIntent
+ " not found for ExtensionType "
+ extensionType);
@@ -228,7 +228,7 @@
}
private void buildProvidedIntents(PolicySet policySet, Map<QName, Intent> definedIntents)
- throws SCADefinitionsBuilderException {
+ throws DefinitionsBuilderException {
if (policySet != null) {
//resolve all provided intents
List<Intent> providedIntents = new ArrayList<Intent>();
@@ -238,7 +238,7 @@
if (resolvedProvidedIntent != null) {
providedIntents.add(resolvedProvidedIntent);
} else {
- throw new SCADefinitionsBuilderException("Provided Intent - " + providedIntent
+ throw new DefinitionsBuilderException("Provided Intent - " + providedIntent
+ " not found for PolicySet "
+ policySet);
@@ -253,7 +253,7 @@
}
private void buildIntentsInMappedPolicies(PolicySet policySet, Map<QName, Intent> definedIntents)
- throws SCADefinitionsBuilderException {
+ throws DefinitionsBuilderException {
Map<Intent, List<Object>> mappedPolicies = new Hashtable<Intent, List<Object>>();
for (Map.Entry<Intent, List<Object>> entry : policySet.getMappedPolicies().entrySet()) {
Intent mappedIntent = entry.getKey();
@@ -263,7 +263,7 @@
if (resolvedMappedIntent != null) {
mappedPolicies.put(resolvedMappedIntent, entry.getValue());
} else {
- throw new SCADefinitionsBuilderException("Mapped Intent - " + mappedIntent
+ throw new DefinitionsBuilderException("Mapped Intent - " + mappedIntent
+ " not found for PolicySet "
+ policySet);
@@ -278,7 +278,7 @@
}
private void buildReferredPolicySets(PolicySet policySet, Map<QName, PolicySet> definedPolicySets)
- throws SCADefinitionsBuilderException {
+ throws DefinitionsBuilderException {
List<PolicySet> referredPolicySets = new ArrayList<PolicySet>();
for (PolicySet referredPolicySet : policySet.getReferencedPolicySets()) {
@@ -287,7 +287,7 @@
if (resolvedReferredPolicySet != null) {
referredPolicySets.add(resolvedReferredPolicySet);
} else {
- throw new SCADefinitionsBuilderException("Referred PolicySet - " + referredPolicySet
+ throw new DefinitionsBuilderException("Referred PolicySet - " + referredPolicySet
+ "not found for PolicySet - "
+ policySet);
}
Propchange: tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderImpl.java
------------------------------------------------------------------------------
eol-style = native
Propchange: tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 14 15:06:31 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java:671193
+/tuscany/java/sca/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java:694855
Modified: tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java (original)
+++ tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java Tue Oct 14 15:06:31 2008
@@ -27,5 +27,5 @@
* Create an instance of SCA definitions
* @return a new instance of SCA definitions
*/
- SCADefinitions createDefinitions();
+ Definitions createDefinitions();
}
Copied: tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java (from r704290, tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java?p2=tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java&p1=tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java&r1=704290&r2=704715&rev=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java Tue Oct 14 15:06:31 2008
@@ -22,7 +22,7 @@
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.policy.Intent;
import org.apache.tuscany.sca.policy.IntentAttachPointType;
import org.apache.tuscany.sca.policy.PolicySet;
@@ -32,9 +32,9 @@
*
* @version $Rev$ $Date$
*/
-public class SCADefinitionsImpl implements SCADefinitions {
+public class DefinitionsImpl implements Definitions {
private String targetNamespace = null;
- private List<Intent> policyIntents = new CopyOnWriteArrayList<Intent>();
+ private List<Intent> intents = new CopyOnWriteArrayList<Intent>();
private List<PolicySet> policySets = new CopyOnWriteArrayList<PolicySet>();
private List<IntentAttachPointType> bindingTypes = new CopyOnWriteArrayList<IntentAttachPointType>();
private List<IntentAttachPointType> implementationTypes = new CopyOnWriteArrayList<IntentAttachPointType>();
@@ -49,8 +49,8 @@
return implementationTypes;
}
- public List<Intent> getPolicyIntents() {
- return policyIntents;
+ public List<Intent> getIntents() {
+ return intents;
}
public List<PolicySet> getPolicySets() {
Propchange: tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java
------------------------------------------------------------------------------
eol-style = native
Propchange: tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 14 15:06:31 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java:671193
+/tuscany/java/sca/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java:694855
Copied: tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java (from r704290, tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java?p2=tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java&p1=tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java&r1=704290&r2=704715&rev=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java (original)
+++ tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java Tue Oct 14 15:06:31 2008
@@ -19,69 +19,23 @@
package org.apache.tuscany.sca.definitions.util;
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
+import org.apache.tuscany.sca.definitions.Definitions;
/**
* Some utility functions to deal with SCADefinitions
*
* @version $Rev$ $Date$
*/
-public class SCADefinitionsUtil {
+public class DefinitionsUtil {
- public static void stripDuplicates(SCADefinitions scaDefns) {
- Map<QName, Intent> definedIntents = new HashMap<QName, Intent>();
- for (Intent intent : scaDefns.getPolicyIntents()) {
- definedIntents.put(intent.getName(), intent);
- }
- Map<QName, PolicySet> definedPolicySets = new HashMap<QName, PolicySet>();
- for (PolicySet policySet : scaDefns.getPolicySets()) {
- definedPolicySets.put(policySet.getName(), policySet);
- }
-
- Map<QName, IntentAttachPointType> definedBindingTypes = new HashMap<QName, IntentAttachPointType>();
- for (IntentAttachPointType bindingType : scaDefns.getBindingTypes()) {
- definedBindingTypes.put(bindingType.getName(), bindingType);
- }
-
- Map<QName, IntentAttachPointType> definedImplTypes = new HashMap<QName, IntentAttachPointType>();
- for (IntentAttachPointType implType : scaDefns.getImplementationTypes()) {
- definedImplTypes.put(implType.getName(), implType);
- }
-
- scaDefns.getPolicyIntents().clear();
- scaDefns.getPolicyIntents().addAll(definedIntents.values());
- scaDefns.getPolicySets().clear();
- scaDefns.getPolicySets().addAll(definedPolicySets.values());
- scaDefns.getBindingTypes().clear();
- scaDefns.getBindingTypes().addAll(definedBindingTypes.values());
- scaDefns.getImplementationTypes().clear();
- scaDefns.getImplementationTypes().addAll(definedImplTypes.values());
- }
- public static void aggregateSCADefinitions(SCADefinitions source, SCADefinitions target) {
- target.getPolicyIntents().addAll(source.getPolicyIntents());
+ public static void aggregate(Definitions source, Definitions target) {
+ target.getIntents().addAll(source.getIntents());
target.getPolicySets().addAll(source.getPolicySets());
target.getBindingTypes().addAll(source.getBindingTypes());
target.getImplementationTypes().addAll(source.getImplementationTypes());
target.getBindings().addAll(source.getBindings());
}
- public static boolean isSCADefnsFile(URI uri) {
- int index = uri.toString().lastIndexOf("/");
-
- index = (index != -1) ? index + 1 : 0;
-
- return uri.toString().substring(index).equals("definitions.xml");
- }
-
}
Propchange: tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
------------------------------------------------------------------------------
eol-style = native
Propchange: tuscany/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 14 15:06:31 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java:671193
+/tuscany/java/sca/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java:694855
Modified: tuscany/branches/sca-equinox/modules/extensibility/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/extensibility/pom.xml?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/extensibility/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/extensibility/pom.xml Tue Oct 14 15:06:31 2008
@@ -40,7 +40,10 @@
<Bundle-Version>${tuscany.version}</Bundle-Version>
<Bundle-SymbolicName>org.apache.tuscany.sca.extensibility</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
- <Export-Package>org.apache.tuscany.sca.*</Export-Package>
+ <Export-Package>
+ org.apache.tuscany.sca.core,
+ org.apache.tuscany.sca.extensibility
+ </Export-Package>
</instructions>
</configuration>
</plugin>
Modified: tuscany/branches/sca-equinox/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java (original)
+++ tuscany/branches/sca-equinox/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java Tue Oct 14 15:06:31 2008
@@ -42,7 +42,7 @@
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.policy.Intent;
import org.apache.tuscany.sca.policy.PolicySet;
import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
@@ -59,7 +59,7 @@
private static XMLInputFactory inputFactory;
private static StAXArtifactProcessor<Object> staxProcessor;
- private static URLArtifactProcessor<SCADefinitions> policyDefinitionsProcessor;
+ private static URLArtifactProcessor<Definitions> policyDefinitionsProcessor;
private static CompositeBuilder compositeBuilder;
@BeforeClass
@@ -72,7 +72,7 @@
compositeBuilder = extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
- policyDefinitionsProcessor = documentProcessors.getProcessor(SCADefinitions.class);
+ policyDefinitionsProcessor = documentProcessors.getProcessor(Definitions.class);
}
@Test
@@ -93,7 +93,7 @@
URL url = getClass().getResource("definitions.xml");
URI uri = URI.create("definitions.xml");
- SCADefinitions scaDefns = policyDefinitionsProcessor.read(null, uri, url);
+ Definitions scaDefns = policyDefinitionsProcessor.read(null, uri, url);
InputStream is = getClass().getResourceAsStream("Calculator.composite");
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
@@ -158,7 +158,7 @@
URL url = getClass().getResource("definitions_with_policysets.xml");
URI uri = URI.create("definitions_with_policysets.xml");
- SCADefinitions policyDefinitions = policyDefinitionsProcessor.read(null, uri, url);
+ Definitions policyDefinitions = policyDefinitionsProcessor.read(null, uri, url);
InputStream is = getClass().getResourceAsStream("Calculator.composite");
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
Modified: tuscany/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java Tue Oct 14 15:06:31 2008
@@ -36,7 +36,7 @@
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.implementation.node.NodeImplementation;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.monitor.Monitor;
@@ -76,7 +76,7 @@
return "org.apache.tuscany.sca.implementation.node.builder.NodeCompositeBuilder";
}
- public void build(Composite composite, SCADefinitions definitions, Monitor monitor) throws CompositeBuilderException {
+ public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
// Process each node component in the given composite
for (Component component: composite.getComponents()) {
Modified: tuscany/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java (original)
+++ tuscany/branches/sca-equinox/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java Tue Oct 14 15:06:31 2008
@@ -20,7 +20,6 @@
package org.apache.tuscany.sca.node.impl;
import static java.lang.System.currentTimeMillis;
-import static org.apache.tuscany.sca.definitions.util.SCADefinitionsUtil.aggregateSCADefinitions;
import static org.apache.tuscany.sca.node.impl.NodeUtil.contribution;
import static org.apache.tuscany.sca.node.impl.NodeUtil.createURI;
@@ -50,12 +49,10 @@
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.processor.ContributionResolveException;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
@@ -71,8 +68,7 @@
import org.apache.tuscany.sca.core.invocation.ExtensibleProxyFactory;
import org.apache.tuscany.sca.core.invocation.ProxyFactory;
import org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.definitions.impl.SCADefinitionsImpl;
+import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.implementation.node.ConfiguredNodeImplementation;
import org.apache.tuscany.sca.implementation.node.NodeImplementationFactory;
import org.apache.tuscany.sca.monitor.Monitor;
@@ -81,12 +77,6 @@
import org.apache.tuscany.sca.monitor.Problem.Severity;
import org.apache.tuscany.sca.node.Client;
import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.provider.SCADefinitionsProvider;
-import org.apache.tuscany.sca.provider.SCADefinitionsProviderException;
-import org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
import org.apache.tuscany.sca.runtime.RuntimeComponentContext;
import org.apache.tuscany.sca.work.WorkScheduler;
@@ -130,7 +120,7 @@
private List<ModuleActivator> moduleActivators = new ArrayList<ModuleActivator>();
private CompositeActivator compositeActivator;
private WorkScheduler workScheduler;
- private SCADefinitions systemDefinitions;
+ private Definitions systemDefinitions;
/**
* Constructs a new SCA node.
@@ -327,13 +317,13 @@
// the Equinox environment initially
// // Load the system definitions.xml
-// SCADefinitionsProviderExtensionPoint definitionsProviders = extensionPoints.getExtensionPoint(SCADefinitionsProviderExtensionPoint.class);
-// systemDefinitions = new SCADefinitionsImpl();
+// DefinitionsProviderExtensionPoint definitionsProviders = extensionPoints.getExtensionPoint(DefinitionsProviderExtensionPoint.class);
+// systemDefinitions = new DefinitionsImpl();
// try {
-// for (SCADefinitionsProvider definitionsProvider : definitionsProviders.getSCADefinitionsProviders()) {
-// aggregateSCADefinitions(definitionsProvider.getSCADefinition(), systemDefinitions);
+// for (DefinitionsProvider definitionsProvider : definitionsProviders.getDefinitionsProviders()) {
+// aggregateDefinitions(definitionsProvider.getSCADefinition(), systemDefinitions);
// }
-// } catch (SCADefinitionsProviderException e) {
+// } catch (DefinitionsProviderException e) {
// throw new IllegalStateException(e);
// }
//
@@ -354,7 +344,7 @@
//
// // Now that all system sca definitions have been read, let's resolve them
// URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-// URLArtifactProcessor<SCADefinitions> definitionsProcessor = documentProcessors.getProcessor(SCADefinitions.class);
+// URLArtifactProcessor<Definitions> definitionsProcessor = documentProcessors.getProcessor(Definitions.class);
// try {
// definitionsProcessor.resolve(systemDefinitions, definitionsResolver);
// } catch (ContributionResolveException e) {
@@ -437,10 +427,10 @@
}
// Build an aggregated SCA definitions model
- SCADefinitions definitions = systemDefinitions;
- //definitions = new SCADefinitionsImpl();
- //for (SCADefinitions definition : ((List<SCADefinitions>)policyDefinitions)) {
- // SCADefinitionsUtil.aggregateSCADefinitions(definition, definitions);
+ Definitions definitions = systemDefinitions;
+ //definitions = new DefinitionsImpl();
+ //for (Definitions definition : ((List<Definitions>)policyDefinitions)) {
+ // DefinitionsUtil.aggregateDefinitions(definition, definitions);
//}
// Build the composite and wire the components included in it
Modified: tuscany/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java (original)
+++ tuscany/branches/sca-equinox/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/LoggingPolicyDefinitionsProvider.java Tue Oct 14 15:06:31 2008
@@ -27,25 +27,25 @@
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.provider.SCADefinitionsProvider;
-import org.apache.tuscany.sca.provider.SCADefinitionsProviderException;
+import org.apache.tuscany.sca.definitions.Definitions;
+import org.apache.tuscany.sca.provider.DefinitionsProvider;
+import org.apache.tuscany.sca.provider.DefinitionsProviderException;
/**
* Provider for Policy Intents and PolicySet definitions related to security
*
* @version $Rev$ $Date$
*/
-public class LoggingPolicyDefinitionsProvider implements SCADefinitionsProvider {
+public class LoggingPolicyDefinitionsProvider implements DefinitionsProvider {
private String definitionsFile = "org/apache/tuscany/sca/policy/logging/definitions.xml";
URLArtifactProcessor urlArtifactProcessor = null;
public LoggingPolicyDefinitionsProvider(ExtensionPointRegistry registry) {
URLArtifactProcessorExtensionPoint documentProcessors = registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
- urlArtifactProcessor = (URLArtifactProcessor)documentProcessors.getProcessor(SCADefinitions.class);
+ urlArtifactProcessor = (URLArtifactProcessor)documentProcessors.getProcessor(Definitions.class);
}
- public SCADefinitions getSCADefinition() throws SCADefinitionsProviderException {
+ public Definitions getDefinitions() throws DefinitionsProviderException {
// Allow privileged access to load resource. Requires RuntimePermssion in security policy.
URL definitionsFileUrl = AccessController.doPrivileged(new PrivilegedAction<URL>() {
public URL run() {
@@ -56,11 +56,11 @@
Object scaDefn = null;
try {
URI uri = new URI(definitionsFile);
- return (SCADefinitions)urlArtifactProcessor.read(null,
+ return (Definitions)urlArtifactProcessor.read(null,
uri,
definitionsFileUrl);
} catch ( Exception e ) {
- throw new SCADefinitionsProviderException(e);
+ throw new DefinitionsProviderException(e);
}
}
Propchange: tuscany/branches/sca-equinox/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 14 15:06:31 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider:671193
+/tuscany/java/sca/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider:694855
Modified: tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java (original)
+++ tuscany/branches/sca-equinox/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java Tue Oct 14 15:06:31 2008
@@ -27,29 +27,29 @@
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.definitions.util.SCADefinitionsUtil;
-import org.apache.tuscany.sca.provider.SCADefinitionsProvider;
-import org.apache.tuscany.sca.provider.SCADefinitionsProviderException;
+import org.apache.tuscany.sca.definitions.Definitions;
+import org.apache.tuscany.sca.definitions.util.DefinitionsUtil;
+import org.apache.tuscany.sca.provider.DefinitionsProvider;
+import org.apache.tuscany.sca.provider.DefinitionsProviderException;
/**
* Provider for Policy Intents and PolicySet definitions related to security
*
* @version $Rev$ $Date$
*/
-public class SecurityPolicyDefinitionsProvider implements SCADefinitionsProvider {
+public class SecurityPolicyDefinitionsProvider implements DefinitionsProvider {
private static final String tuscanyDefinitionsFile = "org/apache/tuscany/sca/policy/security/tuscany_definitions.xml";
private String definitionsFile = "org/apache/tuscany/sca/policy/security/definitions.xml";
URLArtifactProcessor urlArtifactProcessor = null;
public SecurityPolicyDefinitionsProvider(ExtensionPointRegistry registry) {
URLArtifactProcessorExtensionPoint documentProcessors = registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
- urlArtifactProcessor = (URLArtifactProcessor)documentProcessors.getProcessor(SCADefinitions.class);
+ urlArtifactProcessor = (URLArtifactProcessor)documentProcessors.getProcessor(Definitions.class);
}
- public SCADefinitions getSCADefinition() throws SCADefinitionsProviderException {
- SCADefinitions scaDefns = null;
- SCADefinitions tuscanyDefns = null;
+ public Definitions getDefinitions() throws DefinitionsProviderException {
+ Definitions scaDefns = null;
+ Definitions tuscanyDefns = null;
try {
// Allow privileged access to load resource. Requires RuntimePermssion in security policy.
URL definitionsFileUrl = AccessController.doPrivileged(new PrivilegedAction<URL>() {
@@ -60,7 +60,7 @@
URI uri = new URI(definitionsFile);
- scaDefns = (SCADefinitions)urlArtifactProcessor.read(null,
+ scaDefns = (Definitions)urlArtifactProcessor.read(null,
uri,
definitionsFileUrl);
@@ -71,15 +71,15 @@
});
uri = new URI(definitionsFile);
- tuscanyDefns = (SCADefinitions)urlArtifactProcessor.read(null,
+ tuscanyDefns = (Definitions)urlArtifactProcessor.read(null,
uri,
definitionsFileUrl);
- SCADefinitionsUtil.aggregateSCADefinitions(tuscanyDefns, scaDefns);
+ DefinitionsUtil.aggregate(tuscanyDefns, scaDefns);
return scaDefns;
} catch ( Exception e ) {
- throw new SCADefinitionsProviderException(e);
+ throw new DefinitionsProviderException(e);
}
}
Propchange: tuscany/branches/sca-equinox/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 14 15:06:31 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider:671193
+/tuscany/java/sca/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider:694855
Modified: tuscany/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java (original)
+++ tuscany/branches/sca-equinox/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyDefinitionsProvider.java Tue Oct 14 15:06:31 2008
@@ -25,17 +25,17 @@
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.definitions.util.SCADefinitionsUtil;
-import org.apache.tuscany.sca.provider.SCADefinitionsProvider;
-import org.apache.tuscany.sca.provider.SCADefinitionsProviderException;
+import org.apache.tuscany.sca.definitions.Definitions;
+import org.apache.tuscany.sca.definitions.util.DefinitionsUtil;
+import org.apache.tuscany.sca.provider.DefinitionsProvider;
+import org.apache.tuscany.sca.provider.DefinitionsProviderException;
/**
* Provider for Policy Intents and PolicySet definitions related to transaction
*
* @version $Rev$ $Date$
*/
-public class TransactionPolicyDefinitionsProvider implements SCADefinitionsProvider {
+public class TransactionPolicyDefinitionsProvider implements DefinitionsProvider {
private static final String scaDefinitionsFile = "definitions.xml";
private static final String tuscanyDefinitionsFile = "tuscany_definitions.xml";
private URLArtifactProcessor urlArtifactProcessor;
@@ -43,28 +43,28 @@
public TransactionPolicyDefinitionsProvider(ExtensionPointRegistry registry) {
URLArtifactProcessorExtensionPoint documentProcessors =
registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
- urlArtifactProcessor = (URLArtifactProcessor)documentProcessors.getProcessor(SCADefinitions.class);
+ urlArtifactProcessor = (URLArtifactProcessor)documentProcessors.getProcessor(Definitions.class);
}
- public SCADefinitions getSCADefinition() throws SCADefinitionsProviderException {
+ public Definitions getDefinitions() throws DefinitionsProviderException {
try {
- SCADefinitions scaTransactionPolicyDefns = null;
- SCADefinitions tuscanyTransactionPolicyDefns = null;
+ Definitions scaTransactionPolicyDefns = null;
+ Definitions tuscanyTransactionPolicyDefns = null;
URI uri = new URI(scaDefinitionsFile);
URL defintionsFileUrl = getClass().getResource(scaDefinitionsFile);
- scaTransactionPolicyDefns = (SCADefinitions)urlArtifactProcessor.read(null, uri, defintionsFileUrl);
+ scaTransactionPolicyDefns = (Definitions)urlArtifactProcessor.read(null, uri, defintionsFileUrl);
uri = new URI(tuscanyDefinitionsFile);
defintionsFileUrl = getClass().getResource(tuscanyDefinitionsFile);
- tuscanyTransactionPolicyDefns = (SCADefinitions)urlArtifactProcessor.read(null, uri, defintionsFileUrl);
+ tuscanyTransactionPolicyDefns = (Definitions)urlArtifactProcessor.read(null, uri, defintionsFileUrl);
- SCADefinitionsUtil.aggregateSCADefinitions(tuscanyTransactionPolicyDefns, scaTransactionPolicyDefns);
+ DefinitionsUtil.aggregate(tuscanyTransactionPolicyDefns, scaTransactionPolicyDefns);
return scaTransactionPolicyDefns;
} catch (Exception e) {
- throw new SCADefinitionsProviderException(e);
+ throw new DefinitionsProviderException(e);
}
}
Propchange: tuscany/branches/sca-equinox/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.DefinitionsProvider
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 14 15:06:31 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider:671193
+/tuscany/java/sca/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider:694855
Modified: tuscany/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Echo.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Echo.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Echo.java (original)
+++ tuscany/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Echo.java Tue Oct 14 15:06:31 2008
@@ -18,15 +18,15 @@
*/
package dbecho;
-import org.apache.tuscany.sca.databinding.annotation.DataBinding;
+import org.apache.tuscany.sca.databinding.annotation.DataType;
import org.osoa.sca.annotations.Remotable;
/**
* @version $Rev$ $Date$
*/
-@DataBinding("org.w3c.dom.Node")
@Remotable
public interface Echo {
- Object echo(Object msg);
+ @DataType("org.w3c.dom.Node")
+ Object echo(@DataType("org.w3c.dom.Node") Object msg);
}
Modified: tuscany/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface1.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface1.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface1.java (original)
+++ tuscany/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface1.java Tue Oct 14 15:06:31 2008
@@ -18,15 +18,17 @@
*/
package dbecho;
-import org.apache.tuscany.sca.databinding.annotation.DataBinding;
+import org.apache.tuscany.sca.databinding.annotation.DataType;
import org.osoa.sca.annotations.Remotable;
/**
* @version $Rev$ $Date$
*/
-@DataBinding("java.lang.String")
@Remotable
public interface Interface1 {
- String call(String msg);
- String call1(String msg);
+ @DataType("java.lang.String")
+ String call(@DataType("java.lang.String") String msg);
+
+ @DataType("java.lang.String")
+ String call1(@DataType("java.lang.String") String msg);
}
Modified: tuscany/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface2.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface2.java?rev=704715&r1=704714&r2=704715&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface2.java (original)
+++ tuscany/branches/sca-equinox/samples/databinding-echo/src/main/java/dbecho/Interface2.java Tue Oct 14 15:06:31 2008
@@ -20,17 +20,14 @@
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.sca.databinding.annotation.DataBinding;
import org.osoa.sca.annotations.Remotable;
import org.w3c.dom.Node;
/**
* @version $Rev$ $Date$
*/
-@DataBinding("org.w3c.dom.Node")
@Remotable
public interface Interface2 {
Node call(Node msg);
- @DataBinding("javax.xml.stream.XMLStreamReader")
XMLStreamReader call1(XMLStreamReader msg);
}