Author: [email protected]
Date: Fri Aug 12 10:00:30 2011
New Revision: 1312
Log:
[AMDATUOPENSOCIAL-85] Fixed tenant hostname filter registration for calls to
/rpc
Modified:
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
Modified:
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
(original)
+++
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
Fri Aug 12 10:00:30 2011
@@ -144,7 +144,9 @@
// Create the configuration module
Dictionary<String, Object> properties2 = new Hashtable<String,
Object>();
properties2.put("pattern",
- "(" + ShindigRegistrationServiceImpl.GADGETS_BASE + "/.*)|("
+ "(" + ShindigRegistrationServiceImpl.GADGETS_BASE + "/.*)|("
+ + ShindigRegistrationServiceImpl.GADGETS_RPC_BASE + "/.*)|("
+ + ShindigRegistrationServiceImpl.GADGETS_RPC_BASE + "?.*)|("
+ ShindigRegistrationServiceImpl.REST_BASE + "/.*)");
properties2.put(Constants.SERVICE_RANKING, 100);
manager.add(
Modified:
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
Fri Aug 12 10:00:30 2011
@@ -66,13 +66,18 @@
/**
* Basic URL alias for social REST calls.
*/
- public static final String REST_BASE = "/social/rest";
+ public static final String REST_BASE = "/social/rest";
+
+ /**
+ * Basix URL alias for RPC calls.
+ */
+ public static final String GADGETS_RPC_BASE = "/rpc";
// Base URLs for filters, servlets and static resources
private static final String GADGET_SERVLET_BASE = GADGETS_BASE + "/ifr";
private static final String PROXY_BASE = GADGETS_BASE + "/proxy";
private static final String MAKEREQUEST_BASE = GADGETS_BASE +
"/makeRequest";
- private static final String GADGETS_RPC_BASE = "/rpc";
+
private static final String GADGETS_REST_BASE = GADGETS_BASE + "/api/rest";
private static final String CONCAT_BASE = GADGETS_BASE + "/concat";
private static final String JS_BASE = GADGETS_BASE + "/js";
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
