Author: keith
Date: Sat Jan 26 22:48:45 2008
New Revision: 12980
Log:
Deleting deprecated annotation for .disable
Modified:
trunk/mashup/java/modules/integration/test-resources/scripts/echoservice.js
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JavaScriptServiceAnnotationParser.java
trunk/mashup/java/modules/javascriptdeployer/test-resources/repo/scripts/JSService.js
Modified:
trunk/mashup/java/modules/integration/test-resources/scripts/echoservice.js
==============================================================================
--- trunk/mashup/java/modules/integration/test-resources/scripts/echoservice.js
(original)
+++ trunk/mashup/java/modules/integration/test-resources/scripts/echoservice.js
Sat Jan 26 22:48:45 2008
@@ -16,7 +16,6 @@
var test;
this.targetNamespace = "www.wso2.org/mashup/demo";
this.serviceName = "echoService";
-this.disable=false;
this.schemaTargetNamespace = "www.wso2.org/mashup/schema";
echoJSON.inputTypes = "#raw";
Modified:
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java
==============================================================================
---
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java
(original)
+++
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java
Sat Jan 26 22:48:45 2008
@@ -326,10 +326,7 @@
JavaScriptServiceAnnotationParser serviceAnnotationParser =
new JavaScriptServiceAnnotationParser(
engine, shortFileName);
- if (serviceAnnotationParser.isDisable()) {
- return null;
- }
-
+
axisService.setParent(axisServiceGroup);
axisService.setClassLoader(currentFile.getClassLoader());
String name = serviceAnnotationParser.getServiceName();
Modified:
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JavaScriptServiceAnnotationParser.java
==============================================================================
---
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JavaScriptServiceAnnotationParser.java
(original)
+++
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JavaScriptServiceAnnotationParser.java
Sat Jan 26 22:48:45 2008
@@ -49,8 +49,6 @@
private String schemaTargetNamespace = null;
- private boolean disable = false;
-
private String serviceName;
private String serviceScope;
@@ -69,9 +67,6 @@
schemaTargetNamespace = "http://services.mashup.wso2.org/"; +
serviceName + "?xsd";
}
- Object serviceDisableObject = service.get("disable", service);
- disable = MashupUtils.isJSObjectTrue(disable, serviceDisableObject);
-
Object serviceNameObject = service.get("serviceName", service);
if (serviceNameObject instanceof String) {
String serviceNameString = ((String) serviceNameObject).trim();
@@ -105,13 +100,6 @@
}
}
- /**
- * @deprecated no longer used as a annotation
- */
- public boolean isDisable() {
- return disable;
- }
-
public String getSchemaTargetNamespace() {
return schemaTargetNamespace;
}
Modified:
trunk/mashup/java/modules/javascriptdeployer/test-resources/repo/scripts/JSService.js
==============================================================================
---
trunk/mashup/java/modules/javascriptdeployer/test-resources/repo/scripts/JSService.js
(original)
+++
trunk/mashup/java/modules/javascriptdeployer/test-resources/repo/scripts/JSService.js
Sat Jan 26 22:48:45 2008
@@ -16,7 +16,6 @@
var test;
this.targetNamespace = "www.wso2.org/mashup/demo";
this.serviceName = "echoService";
-this.disable=false;
this.schemaTargetNamespace = "www.wso2.org/mashup/schema";
//echoJSON.visible = true;
function echoJSON(param){
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
