- Solving some problems related with java version;

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@801658 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 13 insertions, 12 deletions

diff --git a/sandbox/dougsleite/policy-recoveryrules/pom.xml b/sandbox/dougsleite/policy-recoveryrules/pom.xml
index b2a98e8323..cadebf4985 100644
--- a/sandbox/dougsleite/policy-recoveryrules/pom.xml
+++ b/sandbox/dougsleite/policy-recoveryrules/pom.xml
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

-<project>

+<project xmlns:pom="http://maven.apache.org/POM/4.0.0">

     <modelVersion>4.0.0</modelVersion>

     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

@@ -26,8 +26,8 @@
         <relativePath>../pom.xml</relativePath>

     </parent>

     <artifactId>tuscany-policy-recoveryrules</artifactId>

-    <name>Apache Tuscany SCA Recovery Rules Model</name>

-    

+    <name>Apache Tuscany SCA Recovery Rules Policy Model</name>

+

     <dependencies>

 

         <dependency>

@@ -35,29 +35,29 @@
             <artifactId>tuscany-contribution</artifactId>

             <version>1.6-SNAPSHOT</version>

         </dependency>

-        

+

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-assembly-xml</artifactId>

             <version>1.6-SNAPSHOT</version>

         </dependency>

-        

+

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-policy</artifactId>

             <version>1.6-SNAPSHOT</version>

         </dependency>

-        

+

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-contribution-impl</artifactId>

             <version>1.6-SNAPSHOT</version>

             <scope>test</scope>

         </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-guardian-model</artifactId>

-            <version>1.6-SNAPSHOT</version>

+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-guardian</artifactId>
+            <version>1.6-SNAPSHOT</version>
         </dependency>

     </dependencies>

 

@@ -81,3 +81,4 @@
 

 </project>

 

+

diff --git a/sandbox/dougsleite/policy-recoveryrules/src/main/java/org/apache/tuscany/sca/policy/recoveryrules/RecoveryRulesPolicyProcessor.java b/sandbox/dougsleite/policy-recoveryrules/src/main/java/org/apache/tuscany/sca/policy/recoveryrules/RecoveryRulesPolicyProcessor.java
index c7ddb2db4a..44e6e04594 100644
--- a/sandbox/dougsleite/policy-recoveryrules/src/main/java/org/apache/tuscany/sca/policy/recoveryrules/RecoveryRulesPolicyProcessor.java
+++ b/sandbox/dougsleite/policy-recoveryrules/src/main/java/org/apache/tuscany/sca/policy/recoveryrules/RecoveryRulesPolicyProcessor.java
@@ -124,7 +124,7 @@ public class RecoveryRulesPolicyProcessor implements StAXArtifactProcessor<Recov
                     break;
                 case XMLStreamConstants.CHARACTERS:
                     String text = reader.getText().trim();
-                    if (!text.isEmpty()) {
+                    if (text.length() != 0) {
                         fac.createOMText(current, reader.getText());
                     }
                     break;
diff --git a/sandbox/dougsleite/policy-recoveryrules/src/test/java/org/apache/tuscany/sca/policy/recoveryrules/PolicyReadTestCase.java b/sandbox/dougsleite/policy-recoveryrules/src/test/java/org/apache/tuscany/sca/policy/recoveryrules/PolicyReadTestCase.java
index 0bd1e46aac..93c3dcfaa1 100644
--- a/sandbox/dougsleite/policy-recoveryrules/src/test/java/org/apache/tuscany/sca/policy/recoveryrules/PolicyReadTestCase.java
+++ b/sandbox/dougsleite/policy-recoveryrules/src/test/java/org/apache/tuscany/sca/policy/recoveryrules/PolicyReadTestCase.java
@@ -82,7 +82,7 @@ public class PolicyReadTestCase {
             }
 
             //write texts
-            if (!el.getText().isEmpty()) {
+            if (el.getText().length() != 0) {
                 writer.writeCharacters(el.getText());
             }