Author: lresende
Date: Fri Jul 27 18:36:03 2007
New Revision: 560437
URL: http://svn.apache.org/viewvc?view=rev&rev=560437
Log:
[work in progress]
Contribution import/export java support based on new extensibility of
contribution import/export
- Cleaning-up and simple refactoring
Added:
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaExportProcessor.java
- copied, changed from r560420,
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaExportMetadataProcessor.java
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaImportExportModuleActivator.java
- copied, changed from r560420,
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataImporJavaModuleActivator.java
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaImportProcessor.java
- copied, changed from r560420,
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaImportMetadataProcessor.java
Removed:
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataImporJavaModuleActivator.java
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaExportMetadataProcessor.java
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaImportMetadataProcessor.java
Modified:
incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportMetadataProcessorTestCase.java
incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportMetadataProcessorTestCase.java
Copied:
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaExportProcessor.java
(from r560420,
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaExportMetadataProcessor.java)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaExportProcessor.java?view=diff&rev=560437&p1=incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaExportMetadataProcessor.java&r1=560420&p2=incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaExportProcessor.java&r2=560437
==============================================================================
---
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaExportMetadataProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaExportProcessor.java
Fri Jul 27 18:36:03 2007
@@ -35,14 +35,14 @@
import
org.apache.tuscany.sca.contribution.service.ContributionResolveException;
import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-public class JavaExportMetadataProcessor implements
StAXArtifactProcessor<JavaExport> {
+public class JavaExportProcessor implements StAXArtifactProcessor<JavaExport> {
private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";;
private static final QName EXPORT_JAVA = new QName(SCA10_NS,
"export.java");
private static final String PACKAGE = "package";
- public JavaExportMetadataProcessor() {
+ public JavaExportProcessor() {
super();
}
Copied:
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaImportExportModuleActivator.java
(from r560420,
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataImporJavaModuleActivator.java)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaImportExportModuleActivator.java?view=diff&rev=560437&p1=incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataImporJavaModuleActivator.java&r1=560420&p2=incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaImportExportModuleActivator.java&r2=560437
==============================================================================
---
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataImporJavaModuleActivator.java
(original)
+++
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaImportExportModuleActivator.java
Fri Jul 27 18:36:03 2007
@@ -24,17 +24,17 @@
import org.apache.tuscany.sca.core.ModuleActivator;
-public class ContributionMetadataImporJavaModuleActivator implements
ModuleActivator{
- JavaImportMetadataProcessor importProcessor;
- JavaExportMetadataProcessor exportProcessor;
+public class JavaImportExportModuleActivator implements ModuleActivator{
+ JavaImportProcessor importProcessor;
+ JavaExportProcessor exportProcessor;
public Object[] getExtensionPoints() {
return null;
}
public void start(ExtensionPointRegistry registry) {
- importProcessor = new JavaImportMetadataProcessor();
- exportProcessor = new JavaExportMetadataProcessor();
+ importProcessor = new JavaImportProcessor();
+ exportProcessor = new JavaExportProcessor();
StAXArtifactProcessorExtensionPoint processors =
registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
processors.addArtifactProcessor(importProcessor);
Copied:
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaImportProcessor.java
(from r560420,
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaImportMetadataProcessor.java)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaImportProcessor.java?view=diff&rev=560437&p1=incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaImportMetadataProcessor.java&r1=560420&p2=incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaImportProcessor.java&r2=560437
==============================================================================
---
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaImportMetadataProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/service/impl/JavaImportProcessor.java
Fri Jul 27 18:36:03 2007
@@ -35,7 +35,7 @@
import
org.apache.tuscany.sca.contribution.service.ContributionResolveException;
import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-public class JavaImportMetadataProcessor implements
StAXArtifactProcessor<JavaImport> {
+public class JavaImportProcessor implements StAXArtifactProcessor<JavaImport>
{
private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";;
private static final QName IMPORT_JAVA = new QName(SCA10_NS,
"import.java");
@@ -43,7 +43,7 @@
private static final String PACKAGE = "package";
private static final String LOCATION = "location";
- public JavaImportMetadataProcessor() {
+ public JavaImportProcessor() {
super();
}
Modified:
incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportMetadataProcessorTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportMetadataProcessorTestCase.java?view=diff&rev=560437&r1=560436&r2=560437
==============================================================================
---
incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportMetadataProcessorTestCase.java
(original)
+++
incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportMetadataProcessorTestCase.java
Fri Jul 27 18:36:03 2007
@@ -10,7 +10,7 @@
import org.apache.tuscany.sca.contribution.java.JavaExport;
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import
org.apache.tuscany.sca.contribution.service.impl.JavaExportMetadataProcessor;
+import org.apache.tuscany.sca.contribution.service.impl.JavaExportProcessor;
/**
* @version $Rev: 538445 $ $Date: 2007-05-15 23:20:37 -0700 (Tue, 15 May 2007)
$
@@ -39,7 +39,7 @@
public void testLoad() throws Exception {
XMLStreamReader reader = xmlFactory.createXMLStreamReader(new
StringReader(VALID_XML));
- JavaExportMetadataProcessor exportProcessor = new
JavaExportMetadataProcessor();
+ JavaExportProcessor exportProcessor = new JavaExportProcessor();
JavaExport javaExport = exportProcessor.read(reader);
assertEquals("org.apache.tuscany.sca.contribution.java",
javaExport.getPackage());
@@ -48,7 +48,7 @@
public void testLoadInvalid() throws Exception {
XMLStreamReader reader = xmlFactory.createXMLStreamReader(new
StringReader(INVALID_XML));
- JavaExportMetadataProcessor exportProcessor = new
JavaExportMetadataProcessor();
+ JavaExportProcessor exportProcessor = new JavaExportProcessor();
try {
exportProcessor.read(reader);
fail("readerException should have been thrown");
Modified:
incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportMetadataProcessorTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportMetadataProcessorTestCase.java?view=diff&rev=560437&r1=560436&r2=560437
==============================================================================
---
incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportMetadataProcessorTestCase.java
(original)
+++
incubator/tuscany/java/sca/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportMetadataProcessorTestCase.java
Fri Jul 27 18:36:03 2007
@@ -10,7 +10,7 @@
import org.apache.tuscany.sca.contribution.java.JavaImport;
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import
org.apache.tuscany.sca.contribution.service.impl.JavaImportMetadataProcessor;
+import org.apache.tuscany.sca.contribution.service.impl.JavaImportProcessor;
/**
* @version $Rev: 538445 $ $Date: 2007-05-15 23:20:37 -0700 (Tue, 15 May 2007)
$
@@ -39,7 +39,7 @@
public void testLoad() throws Exception {
XMLStreamReader reader = xmlFactory.createXMLStreamReader(new
StringReader(VALID_XML));
- JavaImportMetadataProcessor importProcessor = new
JavaImportMetadataProcessor();
+ JavaImportProcessor importProcessor = new JavaImportProcessor();
JavaImport javaImport = importProcessor.read(reader);
assertEquals("org.apache.tuscany.sca.contribution.java",
javaImport.getPackage());
@@ -49,7 +49,7 @@
public void testLoadInvalid() throws Exception {
XMLStreamReader reader = xmlFactory.createXMLStreamReader(new
StringReader(INVALID_XML));
- JavaImportMetadataProcessor importProcessor = new
JavaImportMetadataProcessor();
+ JavaImportProcessor importProcessor = new JavaImportProcessor();
try {
importProcessor.read(reader);
fail("readerException should have been thrown");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
