Author: lresende
Date: Thu Dec 13 11:45:48 2007
New Revision: 604004
URL: http://svn.apache.org/viewvc?rev=604004&view=rev
Log:
Renaming implementation-data to implementation-data-xml
Added:
incubator/tuscany/java/sca/modules/implementation-data-xml/
- copied from r603898,
incubator/tuscany/java/sca/modules/implementation-data/
incubator/tuscany/java/sca/modules/implementation-data-xml/DISCLAIMER
- copied unchanged from r603990,
incubator/tuscany/java/sca/modules/implementation-data/DISCLAIMER
incubator/tuscany/java/sca/modules/implementation-data-xml/LICENSE
- copied unchanged from r603990,
incubator/tuscany/java/sca/modules/implementation-data/LICENSE
incubator/tuscany/java/sca/modules/implementation-data-xml/NOTICE
- copied unchanged from r603990,
incubator/tuscany/java/sca/modules/implementation-data/NOTICE
incubator/tuscany/java/sca/modules/implementation-data-xml/README
- copied unchanged from r603990,
incubator/tuscany/java/sca/modules/implementation-data/README
incubator/tuscany/java/sca/modules/implementation-data-xml/build.xml
- copied unchanged from r603990,
incubator/tuscany/java/sca/modules/implementation-data/build.xml
incubator/tuscany/java/sca/modules/implementation-data-xml/pom.xml
- copied, changed from r603990,
incubator/tuscany/java/sca/modules/implementation-data/pom.xml
incubator/tuscany/java/sca/modules/implementation-data-xml/src/
- copied from r603990,
incubator/tuscany/java/sca/modules/implementation-data/src/
Removed:
incubator/tuscany/java/sca/modules/implementation-data/
Modified:
incubator/tuscany/java/sca/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementationFactory.java
incubator/tuscany/java/sca/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementationProcessor.java
incubator/tuscany/java/sca/modules/implementation-data-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
incubator/tuscany/java/sca/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/DATAImplementationProcessorTestCase.java
incubator/tuscany/java/sca/modules/implementation-data-xml/src/test/resources/data-feed.composite
incubator/tuscany/java/sca/modules/implementation-data-xml/src/test/resources/data.composite
incubator/tuscany/java/sca/modules/pom.xml
Copied: incubator/tuscany/java/sca/modules/implementation-data-xml/pom.xml
(from r603990, incubator/tuscany/java/sca/modules/implementation-data/pom.xml)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-data-xml/pom.xml?p2=incubator/tuscany/java/sca/modules/implementation-data-xml/pom.xml&p1=incubator/tuscany/java/sca/modules/implementation-data/pom.xml&r1=603990&r2=604004&rev=604004&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-data/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/implementation-data-xml/pom.xml Thu Dec
13 11:45:48 2007
@@ -25,7 +25,7 @@
<version>1.1-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>tuscany-implementation-data</artifactId>
+ <artifactId>tuscany-implementation-data-xml</artifactId>
<name>Apache Tuscany SCA Data Implementation Extension</name>
<repositories>
Modified:
incubator/tuscany/java/sca/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementationFactory.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementationFactory.java?rev=604004&r1=603990&r2=604004&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementationFactory.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementationFactory.java
Thu Dec 13 11:45:48 2007
@@ -22,19 +22,17 @@
import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
-
/**
* A default factory for the DATA implementation model.
*
* @version $Rev$ $Date$
*/
public class DATAImplementationFactory {
-
+
private AssemblyFactory assemblyFactory;
private JavaInterfaceFactory javaFactory;
-
- public DATAImplementationFactory(AssemblyFactory assemblyFactory,
- JavaInterfaceFactory javaFactory) {
+
+ public DATAImplementationFactory(AssemblyFactory assemblyFactory,
JavaInterfaceFactory javaFactory) {
this.assemblyFactory = assemblyFactory;
this.javaFactory = javaFactory;
}
Modified:
incubator/tuscany/java/sca/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementationProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementationProcessor.java?rev=604004&r1=603990&r2=604004&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementationProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementationProcessor.java
Thu Dec 13 11:45:48 2007
@@ -50,7 +50,7 @@
* @version $Rev$ $Date$
*/
public class DATAImplementationProcessor implements
StAXArtifactProcessor<DATAImplementation> {
- protected static final QName IMPLEMENTATION_DATA = new
QName(Constants.SCA10_TUSCANY_NS, "implementation.data");
+ protected static final QName IMPLEMENTATION_DATA_XML = new
QName(Constants.SCA10_TUSCANY_NS, "implementation.data.xml");
private DATAImplementationFactory dataFactory;
@@ -67,7 +67,7 @@
public QName getArtifactType() {
// Returns the qname of the XML element processed by this processor
- return IMPLEMENTATION_DATA;
+ return IMPLEMENTATION_DATA_XML;
}
public Class<DATAImplementation> getModelType() {
@@ -77,7 +77,7 @@
/*
* <component name="CompanyDataComponent">
- * <implementation.data>
+ * <implementation.data.xml>
* <connectionInfo>
* <connectionProperties
* driverClass="org.apache.derby.jdbc.EmbeddedDriver"
@@ -88,9 +88,9 @@
* </component>
*/
public DATAImplementation read(XMLStreamReader reader) throws
ContributionReadException, XMLStreamException {
- assert IMPLEMENTATION_DATA.equals(reader.getName());
+ assert IMPLEMENTATION_DATA_XML.equals(reader.getName());
- // Read an <implementation.data> element
+ // Read an <implementation.data.xml> element
// Create an initialize the DAS implementation model
DATAImplementation implementation =
dataFactory.createDASImplementation();
@@ -108,7 +108,7 @@
}
break;
case XMLStreamConstants.END_ELEMENT:
- if (IMPLEMENTATION_DATA.equals(reader.getName())) {
+ if (IMPLEMENTATION_DATA_XML.equals(reader.getName())) {
return implementation;
}
break;
@@ -121,7 +121,7 @@
}
public void write(DATAImplementation implementation, XMLStreamWriter
writer) throws ContributionWriteException, XMLStreamException {
- writer.writeStartElement(IMPLEMENTATION_DATA.getNamespaceURI(),
IMPLEMENTATION_DATA.getLocalPart());
+ writer.writeStartElement(IMPLEMENTATION_DATA_XML.getNamespaceURI(),
IMPLEMENTATION_DATA_XML.getLocalPart());
if (implementation.getConnectionInfo() != null) {
connectionInfoProcessor.write(implementation.getConnectionInfo(),
writer);
Modified:
incubator/tuscany/java/sca/modules/implementation-data-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-data-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=604004&r1=603990&r2=604004&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-data-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
(original)
+++
incubator/tuscany/java/sca/modules/implementation-data-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
Thu Dec 13 11:45:48 2007
@@ -16,4 +16,4 @@
# under the License.
# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.implementation.data.DATAImplementationProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#implementation.data,model=org.apache.tuscany.sca.implementation.data.DATAImplementation
+org.apache.tuscany.sca.implementation.data.DATAImplementationProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#implementation.data.xml,model=org.apache.tuscany.sca.implementation.data.DATAImplementation
Modified:
incubator/tuscany/java/sca/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/DATAImplementationProcessorTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/DATAImplementationProcessorTestCase.java?rev=604004&r1=603990&r2=604004&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/DATAImplementationProcessorTestCase.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/DATAImplementationProcessorTestCase.java
Thu Dec 13 11:45:48 2007
@@ -43,30 +43,32 @@
*/
public class DATAImplementationProcessorTestCase extends TestCase {
- protected static final QName IMPLEMENTATION_DATA = new
QName(Constants.SCA10_TUSCANY_NS, "implementation.data");
+ protected static final QName IMPLEMENTATION_DATA = new
QName(Constants.SCA10_TUSCANY_NS, "implementation.data.xml");
private static final String COMPOSITE_USING_DATASOURCE =
"<?xml version=\"1.0\" encoding=\"ASCII\"?>"
+ "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\";
xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.0\";
targetNamespace=\"http://data\"; name=\"data\">"
+ " <component name=\"DataComponent\">"
- + " <tuscany:implementation.data>"
+ + " <tuscany:implementation.data.xml>"
+ " <tuscany:connectionInfo datasource=\"dataSource\"/>"
- + " </tuscany:implementation.data>"
- + "</component>";
+ + " </tuscany:implementation.data.xml>"
+ + " </component>"
+ + "</composite>";
private static final String COMPOSITE_USING_CONNECTION_PROPERTIES =
"<?xml version=\"1.0\" encoding=\"ASCII\"?>"
+ "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\";
xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.0\";
targetNamespace=\"http://data\"; name=\"data\">"
+ " <component name=\"DataComponent\">"
- + " <tuscany:implementation.data>"
+ + " <tuscany:implementation.data.xml>"
+ " <tuscany:connectionInfo>"
+ " <tuscany:connectionProperties"
+ " driverClass=\"driverClass\""
+ " databaseURL=\"databaseURL\""
+ " loginTimeout=\"1\"/>"
+ " </tuscany:connectionInfo>"
- + " </tuscany:implementation.data>"
- + "</component>";
+ + " </tuscany:implementation.data.xml>"
+ + " </component>"
+ + "</composite>";
private XMLInputFactory xmlFactory;
private ModelFactoryExtensionPoint modelFactories;
Modified:
incubator/tuscany/java/sca/modules/implementation-data-xml/src/test/resources/data-feed.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-data-xml/src/test/resources/data-feed.composite?rev=604004&r1=603990&r2=604004&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-data-xml/src/test/resources/data-feed.composite
(original)
+++
incubator/tuscany/java/sca/modules/implementation-data-xml/src/test/resources/data-feed.composite
Thu Dec 13 11:45:48 2007
@@ -37,14 +37,14 @@
</service -->
<component name="CompanyDataComponent">
- <tuscany:implementation.data table="company">
+ <tuscany:implementation.data.xml table="company">
<tuscany:connectionInfo>
<tuscany:connectionProperties
driverClass="org.apache.derby.jdbc.EmbeddedDriver"
databaseURL="jdbc:derby:target/test-classes/dastest;
create = true"
loginTimeout="600000"/>
</tuscany:connectionInfo>
- </tuscany:implementation.data>
+ </tuscany:implementation.data.xml>
</component>
</composite>
Modified:
incubator/tuscany/java/sca/modules/implementation-data-xml/src/test/resources/data.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-data-xml/src/test/resources/data.composite?rev=604004&r1=603990&r2=604004&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-data-xml/src/test/resources/data.composite
(original)
+++
incubator/tuscany/java/sca/modules/implementation-data-xml/src/test/resources/data.composite
Thu Dec 13 11:45:48 2007
@@ -23,14 +23,14 @@
name="data">
<component name="DataComponent">
- <tuscany:implementation.data>
+ <tuscany:implementation.data.xml>
<tuscany:connectionInfo>
<tuscany:connectionProperties
driverClass="org.apache.derby.jdbc.EmbeddedDriver"
databaseURL="jdbc:derby:target/test-classes/dastest;
create = true"
loginTimeout="600000"/>
</tuscany:connectionInfo>
- </tuscany:implementation.data>
+ </tuscany:implementation.data.xml>
</component>
</composite>
Modified: incubator/tuscany/java/sca/modules/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/pom.xml?rev=604004&r1=604003&r2=604004&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/pom.xml Thu Dec 13 11:45:48 2007
@@ -95,7 +95,7 @@
<module>interface-wsdl-xml</module>
<module>implementation-bpel</module>
<module>implementation-das</module>
- <module>implementation-data</module>
+ <module>implementation-data-xml</module>
<module>implementation-ejb</module>
<module>implementation-ejb-xml</module>
<module>implementation-java</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
