Author: keith
Date: Wed Apr 23 07:40:27 2008
New Revision: 16062
Log:
Fixing more registry breaks
Modified:
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java
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
Wed Apr 23 07:40:27 2008
@@ -1197,7 +1197,7 @@
systemRegistry,
MashupConstants.USER_TAGS_QUERY_PATH,
"SELECT A.PATH FROM RESOURCE A, TAG T WHERE A.PATH=? "
+
- "AND T.TAG_NAME=? AND T.AID=A.AID AND
T.USER_ID=? AND " +
+ "AND T.TAG_NAME=? AND T.RID=A.RID AND
T.USER_ID=? AND " +
"(A.MEDIA_TYPE='" +
MashupConstants.MASHUP_MEDIA_TYPE +
"' OR A.MEDIA_TYPE='wso2_data_service')",
RegistryConstants.RESOURCES_RESULT_TYPE
@@ -1210,7 +1210,7 @@
MashupConstants.CUSTOM_QUERY_PATH,
"SELECT DISTINCT A.PATH FROM RESOURCE A, TAG T WHERE
AND " +
"(A.PATH LIKE ? OR A.DESCRIPTION LIKE ? OR
(T.TAG_NAME=? AND " +
- "T.AID=A.AID)) AND (A.MEDIA_TYPE='" +
MashupConstants.MASHUP_MEDIA_TYPE +
+ "T.RID=A.RID)) AND (A.MEDIA_TYPE='" +
MashupConstants.MASHUP_MEDIA_TYPE +
"' OR A.MEDIA_TYPE='wso2_data_service')",
RegistryConstants.RESOURCES_RESULT_TYPE
);
@@ -1222,7 +1222,7 @@
MashupConstants.MY_CUSTOM_QUERY_PATH,
"SELECT DISTINCT A.PATH FROM RESOURCE A, TAG T WHERE
AND " +
"(A.PATH LIKE ? OR A.DESCRIPTION LIKE ? OR
(T.TAG_NAME=? AND " +
- "T.AID=A.AID)) AND A.CREATOR=? AND
(A.MEDIA_TYPE='" +
+ "T.RID=A.RID)) AND A.CREATOR=? AND
(A.MEDIA_TYPE='" +
MashupConstants.MASHUP_MEDIA_TYPE +
"' OR A.MEDIA_TYPE='wso2_data_service')",
RegistryConstants.RESOURCES_RESULT_TYPE
@@ -1233,7 +1233,7 @@
systemRegistry,
MashupConstants.COMMENTS_QUERY_PATH,
"SELECT C.CM_ID FROM COMMENT C, RESOURCE A WHERE
C.COMMENT_TEXT " +
- "LIKE ? AND C.AID=A.AID AND (A.MEDIA_TYPE='" +
+ "LIKE ? AND C.RID=A.RID AND (A.MEDIA_TYPE='" +
MashupConstants.MASHUP_MEDIA_TYPE +
"' OR A.MEDIA_TYPE='wso2_data_service')",
RegistryConstants.COMMENTS_RESULT_TYPE
@@ -1244,7 +1244,7 @@
systemRegistry,
MashupConstants.MY_COMMENTS_QUERY_PATH,
"SELECT C.CM_ID FROM COMMENT C, RESOURCE A WHERE
C.COMMENT_TEXT " +
- "LIKE ? AND C.USER_ID=? AND C.AID=A.AID AND " +
+ "LIKE ? AND C.USER_ID=? AND C.RID=A.RID AND " +
"(A.MEDIA_TYPE='" +
MashupConstants.MASHUP_MEDIA_TYPE +
"' OR A.MEDIA_TYPE='wso2_data_service')",
RegistryConstants.COMMENTS_RESULT_TYPE
@@ -1255,7 +1255,7 @@
systemRegistry,
MashupConstants.USERS_COMMENTS_QUERY_PATH,
"SELECT C.CM_ID FROM COMMENT C, RESOURCE A WHERE
C.USER_ID=? AND " +
- "C.AID=A.AID AND AND (A.MEDIA_TYPE='" +
+ "C.RID=A.RID AND AND (A.MEDIA_TYPE='" +
MashupConstants.MASHUP_MEDIA_TYPE +
"' OR A.MEDIA_TYPE='wso2_data_service')",
RegistryConstants.COMMENTS_RESULT_TYPE
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
