svn commit: r684981 - in /tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee: EJBModuleProcessor.java WebModuleProcessor.java

[rfeng]

Author: rfeng
Date: Mon Aug 11 16:29:14 2008
New Revision: 684981

URL: http://svn.apache.org/viewvc?rev=684981&view=rev
Log:
Change to static references to constants

Modified:
    
tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java
    
tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java

Modified: 
tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java?rev=684981&r1=684980&r2=684981&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java
 (original)
+++ 
tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/EJBModuleProcessor.java
 Mon Aug 11 16:29:14 2008
@@ -106,7 +106,7 @@
                 String intf = 
((JavaInterface)reference.getInterfaceContract().getInterface()).getName();
                 for (String bean : intfToBean.get(intf)) {
                     if (statefulBeans.contains(bean)) {
-                        
reference.getRequiredIntents().add(helper.CONVERSATIONAL_INTENT);
+                        
reference.getRequiredIntents().add(AssemblyHelper.CONVERSATIONAL_INTENT);
                         break;
                     }
                 }
@@ -245,7 +245,7 @@
             }
             service.setInterfaceContract(ic);
             if (conversational) {
-                service.getRequiredIntents().add(helper.CONVERSATIONAL_INTENT);
+                
service.getRequiredIntents().add(AssemblyHelper.CONVERSATIONAL_INTENT);
             }
             componentType.getServices().add(service);
         }
@@ -266,7 +266,7 @@
             }
             service.setInterfaceContract(ic);
             if (conversational) {
-                service.getRequiredIntents().add(helper.CONVERSATIONAL_INTENT);
+                
service.getRequiredIntents().add(AssemblyHelper.CONVERSATIONAL_INTENT);
             }
             componentType.getServices().add(service);
         }
@@ -296,7 +296,7 @@
         for (Map.Entry<String, EnvEntry> entry : 
bean.getEnvEntryMap().entrySet()) {
             EnvEntry envEntry = entry.getValue();
             String type = envEntry.getEnvEntryType();
-            if (!helper.ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
+            if (!AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
                 continue;
             }
             String propertyName = entry.getKey();
@@ -304,7 +304,7 @@
             String value = envEntry.getEnvEntryValue();
             Property property = helper.createComponentProperty();
             property.setName(propertyName);
-            property.setXSDType(helper.ALLOWED_ENV_ENTRY_TYPES.get(type));
+            
property.setXSDType(AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.get(type));
             property.setValue(value);
             componentType.getProperties().add(property);
         }
@@ -340,7 +340,7 @@
         for (Map.Entry<String, EnvEntry> entry : 
bean.getEnvEntryMap().entrySet()) {
             EnvEntry envEntry = entry.getValue();
             String type = envEntry.getEnvEntryType();
-            if (!helper.ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
+            if (!AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
                 continue;
             }
             String propertyName = entry.getKey();
@@ -348,7 +348,7 @@
             String value = envEntry.getEnvEntryValue();
             Property property = helper.createComponentProperty();
             property.setName(propertyName);
-            property.setXSDType(helper.ALLOWED_ENV_ENTRY_TYPES.get(type));
+            
property.setXSDType(AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.get(type));
             property.setValue(value);
             componentType.getProperties().add(property);
         }

Modified: 
tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java?rev=684981&r1=684980&r2=684981&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java
 (original)
+++ 
tuscany/java/sca/modules/contribution-jee/src/main/java/org/apache/tuscany/sca/contribution/jee/WebModuleProcessor.java
 Mon Aug 11 16:29:14 2008
@@ -94,7 +94,7 @@
         for (Map.Entry<String, EnvEntry> entry : 
webApp.getEnvEntryMap().entrySet()) {
             EnvEntry envEntry = entry.getValue();
             String type = envEntry.getEnvEntryType();
-            if (!helper.ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
+            if (!AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.containsKey(type)) {
                 continue;
             }
             String propertyName = entry.getKey();
@@ -102,7 +102,7 @@
             String value = envEntry.getEnvEntryValue();
             Property property = helper.createComponentProperty();
             property.setName(propertyName);
-            property.setXSDType(helper.ALLOWED_ENV_ENTRY_TYPES.get(type));
+            
property.setXSDType(AssemblyHelper.ALLOWED_ENV_ENTRY_TYPES.get(type));
             property.setValue(value);
             componentType.getProperties().add(property);
         }