Author: rineholt
Date: Sun May 7 20:48:02 2006
New Revision: 404910
URL: http://svn.apache.org/viewcvs?rev=404910&view=rev
Log:
http://issues.apache.org/jira/browse/TUSCANY-242
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java
incubator/tuscany/java/sca/samples/helloworldwsclient/src/main/resources/sca.module
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java?rev=404910&r1=404909&r2=404910&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/assembly/ComponentLoader.java
Sun May 7 20:48:02 2006
@@ -173,11 +173,42 @@
configuredReferences.add(configuredReference);
}
- configuredReference.getTargets().add(uri);
+ configuredReference.getTargets().add(prevSpace(uri));
break;
case END_ELEMENT:
return;
}
}
+ }
+
+ protected String prevSpace(String uri){
+ if(uri == null ) return null;
+ String ret= uri.replace('\t', ' ');
+ ret= ret.replace('\n', ' ');
+ ret= ret.replace('\r', ' ');
+ int j;
+ int i;
+ for( i=0; i< ret.length() && ret.charAt(i) == ' '; ++i);
+ if(i== ret.length())return "";
+ for( j= ret.length()-1; j >-1 && ret.charAt(j)== ' ' ; --j);
+ if(j == -1) return "";
+ ret= ret.substring(i, j+1);
+ StringBuilder sb= new StringBuilder(ret.length());
+ boolean prevSpace= false;
+ for(i=0; i< ret.length(); ++i){
+ char c= ret.charAt(i);
+ if(c == ' '){
+ if(!prevSpace){
+ sb.append(c);
+ prevSpace= true;
+ }
+ }else{
+ sb.append(c);
+ prevSpace= false;
+ }
+
+ }
+
+ return sb.toString();
}
}
Modified:
incubator/tuscany/java/sca/samples/helloworldwsclient/src/main/resources/sca.module
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/samples/helloworldwsclient/src/main/resources/sca.module?rev=404910&r1=404909&r2=404910&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/helloworldwsclient/src/main/resources/sca.module
(original)
+++
incubator/tuscany/java/sca/samples/helloworldwsclient/src/main/resources/sca.module
Sun May 7 20:48:02 2006
@@ -23,7 +23,9 @@
<component name="HelloWorldServiceComponent">
<implementation.java
class="org.apache.tuscany.samples.helloworldwsclient.HelloWorldServiceComponentImpl"/>
<references>
- <v:helloWorldService>HelloWorldService</v:helloWorldService>
+ <v:helloWorldService>
+ HelloWorldService
+ </v:helloWorldService>
</references>
</component>
