You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2008/07/28 14:32:28 UTC
svn commit: r680334 - in /tuscany/java/sca/modules/implementation-web: ./
src/main/java/org/apache/tuscany/sca/implementation/web/
src/main/java/org/apache/tuscany/sca/implementation/web/impl/
src/main/java/org/apache/tuscany/sca/implementation/web/xml...
Author: antelder
Date: Mon Jul 28 05:32:27 2008
New Revision: 680334
URL: http://svn.apache.org/viewvc?rev=680334&view=rev
Log:
Update to use web-uri attribute
Modified:
tuscany/java/sca/modules/implementation-web/ (props changed)
tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
tuscany/java/sca/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java
tuscany/java/sca/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java
tuscany/java/sca/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite
Propchange: tuscany/java/sca/modules/implementation-web/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jul 28 05:32:27 2008
@@ -1 +1,19 @@
-\Tuscany\SVN\etc\svn-ignores
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Modified: tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java?rev=680334&r1=680333&r2=680334&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java (original)
+++ tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java Mon Jul 28 05:32:27 2008
@@ -31,12 +31,12 @@
* Returns the webapp URI.
* @return the webapp URI
*/
- String getURI();
+ String getWebURI();
/**
* Sets the Webapp URI.
* @param uri the webapp URI
*/
- void setURI(String webappURI);
+ void setWebURI(String webappURI);
}
Modified: tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java?rev=680334&r1=680333&r2=680334&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java (original)
+++ tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java Mon Jul 28 05:32:27 2008
@@ -38,6 +38,8 @@
private List<Reference> references = new ArrayList<Reference>();
private String uri;
private boolean unresolved;
+
+ private String webURI;
/**
* Constructs a new Web implementation.
@@ -81,4 +83,12 @@
public void setUnresolved(boolean unresolved) {
this.unresolved = unresolved;
}
+
+ public String getWebURI() {
+ return webURI;
+ }
+
+ public void setWebURI(String webURI) {
+ this.webURI = webURI;
+ }
}
Modified: tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java?rev=680334&r1=680333&r2=680334&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java (original)
+++ tuscany/java/sca/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java Mon Jul 28 05:32:27 2008
@@ -72,10 +72,13 @@
WebImplementation implementation = implementationFactory.createWebImplementation();
implementation.setUnresolved(true);
- // Read the uri attribute
- String webappURI = getString(reader, "uri");
- if (webappURI != null) {
- implementation.setURI(webappURI);
+ // Read the webapp uri attribute
+ String webURI = getString(reader, "web-uri");
+ if (webURI != null) {
+ implementation.setWebURI(webURI);
+
+ // Set the URI of the component type
+ implementation.setURI(webURI);
}
// Skip to end element
@@ -111,7 +114,7 @@
// Write <implementation.web>
writeStart(writer, IMPLEMENTATION_WEB.getNamespaceURI(), IMPLEMENTATION_WEB.getLocalPart(),
- new XAttr("uri", implementation.getURI()));
+ new XAttr("web-uri", implementation.getWebURI()));
writeEnd(writer);
}
Modified: tuscany/java/sca/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java?rev=680334&r1=680333&r2=680334&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java (original)
+++ tuscany/java/sca/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java Mon Jul 28 05:32:27 2008
@@ -75,7 +75,7 @@
compositeBuilder.build(composite);
- assertTrue(((WebImplementation) composite.getComponents().get(0).getImplementation()).getURI().equals("MyWebapp"));
+ assertTrue(((WebImplementation) composite.getComponents().get(0).getImplementation()).getWebURI().equals("MyWebapp"));
}
}
Modified: tuscany/java/sca/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java?rev=680334&r1=680333&r2=680334&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java (original)
+++ tuscany/java/sca/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java Mon Jul 28 05:32:27 2008
@@ -59,7 +59,7 @@
ByteArrayOutputStream bos = new ByteArrayOutputStream();
staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos));
- assertTrue(bos.toString().contains("MyWebapp"));
+ assertTrue(bos.toString().contains("web-uri=\"MyWebapp\""));
}
Modified: tuscany/java/sca/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite?rev=680334&r1=680333&r2=680334&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite (original)
+++ tuscany/java/sca/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite Mon Jul 28 05:32:27 2008
@@ -23,7 +23,7 @@
name="TestWeb">
<component name="TestWeb">
- <implementation.web uri="MyWebapp"/>
+ <implementation.web web-uri="MyWebapp"/>
</component>
</composite>