[Carbon-commits] [Carbon] svn commit r92109 - in trunk/carbon/components/deployment-synchronizer/org.wso2.carbon.deployment.synchronizer/src/main: java/org/wso2/carbon/deployment/synchronizer/services java/org/wso2/carbon/deployment/synchronizer/util resources/META-INF
hiranya at wso2.com
hiranya at wso2.com
Wed Apr 20 07:09:46 PDT 2011
Author: hiranya
Date: Wed Apr 20 07:09:46 2011
New Revision: 92109
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=92109
Log:
Fixing the event subscriptions logic
Modified:
trunk/carbon/components/deployment-synchronizer/org.wso2.carbon.deployment.synchronizer/src/main/java/org/wso2/carbon/deployment/synchronizer/services/AutoCheckoutService.java
trunk/carbon/components/deployment-synchronizer/org.wso2.carbon.deployment.synchronizer/src/main/java/org/wso2/carbon/deployment/synchronizer/util/Utils.java
trunk/carbon/components/deployment-synchronizer/org.wso2.carbon.deployment.synchronizer/src/main/resources/META-INF/services.xml
Modified: trunk/carbon/components/deployment-synchronizer/org.wso2.carbon.deployment.synchronizer/src/main/java/org/wso2/carbon/deployment/synchronizer/services/AutoCheckoutService.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/deployment-synchronizer/org.wso2.carbon.deployment.synchronizer/src/main/java/org/wso2/carbon/deployment/synchronizer/services/AutoCheckoutService.java?rev=92109&r1=92108&r2=92109&view=diff
==============================================================================
--- trunk/carbon/components/deployment-synchronizer/org.wso2.carbon.deployment.synchronizer/src/main/java/org/wso2/carbon/deployment/synchronizer/services/AutoCheckoutService.java (original)
+++ trunk/carbon/components/deployment-synchronizer/org.wso2.carbon.deployment.synchronizer/src/main/java/org/wso2/carbon/deployment/synchronizer/services/AutoCheckoutService.java Wed Apr 20 07:09:46 2011
@@ -26,7 +26,8 @@
*/
public class AutoCheckoutService {
- public void Publish(OMElement element) {
-
+ public void notifyUpdate(OMElement element) {
+ // TODO: Implement the deployment synchronizer notification
+ System.out.println(element);
}
}
Modified: trunk/carbon/components/deployment-synchronizer/org.wso2.carbon.deployment.synchronizer/src/main/java/org/wso2/carbon/deployment/synchronizer/util/Utils.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/deployment-synchronizer/org.wso2.carbon.deployment.synchronizer/src/main/java/org/wso2/carbon/deployment/synchronizer/util/Utils.java?rev=92109&r1=92108&r2=92109&view=diff
==============================================================================
--- trunk/carbon/components/deployment-synchronizer/org.wso2.carbon.deployment.synchronizer/src/main/java/org/wso2/carbon/deployment/synchronizer/util/Utils.java (original)
+++ trunk/carbon/components/deployment-synchronizer/org.wso2.carbon.deployment.synchronizer/src/main/java/org/wso2/carbon/deployment/synchronizer/util/Utils.java Wed Apr 20 07:09:46 2011
@@ -32,10 +32,8 @@
import org.wso2.carbon.registry.core.RegistryConstants;
import org.wso2.carbon.registry.core.session.UserRegistry;
import org.wso2.carbon.registry.eventing.RegistryEventingConstants;
-import org.wso2.carbon.registry.eventing.events.CollectionUpdatedEvent;
import org.wso2.carbon.registry.eventing.services.EventingService;
import org.wso2.carbon.utils.ConfigurationContextService;
-import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
public class Utils {
@@ -60,18 +58,12 @@
value = serverConfig.getFirstProperty(DeploymentSynchronizerConstants.AUTO_SYNC_PERIOD);
if (value != null) {
config.setPeriod(Long.parseLong(value));
- } else if (config != null) {
+ } else {
config.setPeriod(DeploymentSynchronizerConstants.DEFAULT_AUTO_SYNC_PERIOD);
}
return config;
}
- public static DeploymentSynchronizerConfiguration getDefaultConfiguration() {
- DeploymentSynchronizerConfiguration config = new DeploymentSynchronizerConfiguration();
- config.setPeriod(DeploymentSynchronizerConstants.DEFAULT_AUTO_SYNC_PERIOD);
- return config;
- }
-
public static String getAbsoluteRegistryPath(String registryPath) {
String registryType = DeploymentSynchronizerConstants.DEFAULT_REGISTRY_TYPE;
ServerConfiguration serverConfig = ServerConfiguration.getInstance();
@@ -93,41 +85,27 @@
}
}
- public static String subscribeForRegistryEventing(UserRegistry registry,
- String absolutePath)
- throws EBRuntimeException, InvalidMessageException{
+ public static String subscribeForRegistryEventing(UserRegistry registry, String absolutePath)
+ throws EBRuntimeException, InvalidMessageException {
EventingService eventingService = ServiceReferenceHolder.getEventingService();
if (eventingService == null) {
throw new IllegalStateException("Registry eventing service unavailable");
}
- String endpoint = getEventReceiverEndpoint();
+ String topic = RegistryEventingConstants.TOPIC_PREFIX + absolutePath +
+ RegistryEvent.TOPIC_SEPARATOR + "#";
Subscription subscription =
- BuilderUtils.createSubscription(endpoint,
+ BuilderUtils.createSubscription(getEventReceiverEndpoint(),
"http://wso2.org/registry/eventing/dialect/topicFilter",
- RegistryEventingConstants.TOPIC_PREFIX + absolutePath +
- RegistryEvent.TOPIC_SEPARATOR + CollectionUpdatedEvent.EVENT_NAME);
+ topic);
+ subscription.setEventDispatcherName(RegistryEventingConstants.TOPIC_PREFIX);
subscription.setTenantId(registry.getCallerTenantId());
subscription.setOwner(registry.getUserName());
return eventingService.subscribe(subscription);
}
- public static void disableAutoCheckoutService() throws AxisFault {
- ConfigurationContextService configurationContextService =
- ServiceReferenceHolder.getConfigurationContextService();
- if (configurationContextService == null) {
- throw new IllegalStateException("Configuration context service unavailable");
- }
-
- AxisConfiguration axisConfig = configurationContextService.getServerConfigContext().
- getAxisConfiguration();
- AxisService service = axisConfig.getService(
- DeploymentSynchronizerConstants.EVENT_RECEIVER_SERVICE);
- service.setActive(false);
- }
-
private static String getEventReceiverEndpoint() {
ConfigurationContextService configurationContextService =
ServiceReferenceHolder.getConfigurationContextService();
Modified: trunk/carbon/components/deployment-synchronizer/org.wso2.carbon.deployment.synchronizer/src/main/resources/META-INF/services.xml
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/deployment-synchronizer/org.wso2.carbon.deployment.synchronizer/src/main/resources/META-INF/services.xml?rev=92109&r1=92108&r2=92109&view=diff
==============================================================================
--- trunk/carbon/components/deployment-synchronizer/org.wso2.carbon.deployment.synchronizer/src/main/resources/META-INF/services.xml (original)
+++ trunk/carbon/components/deployment-synchronizer/org.wso2.carbon.deployment.synchronizer/src/main/resources/META-INF/services.xml Wed Apr 20 07:09:46 2011
@@ -35,8 +35,26 @@
class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/>
</messageReceivers>
<parameter name="ServiceClass">org.wso2.carbon.deployment.synchronizer.services.DeploymentSynchronizerAdmin</parameter>
+ <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/deployment_sync</parameter>
+ <parameter name="adminService" locked="true">true</parameter>
+ <parameter name="hiddenService" locked="true">true</parameter>
+ </service>
+ <service name="AutoCheckoutService" scope="transportsession">
+ <schema schemaNamespace="http://org.apache.synapse/xsd"
+ elementFormDefaultQualified="true"/>
+ <transports>
+ <transport>http</transport>
+ <transport>https</transport>
+ </transports>
+ <description>
+ This utility service receives update events from the registry and triggers auto checkout
+ activities in the deployment synchronizer.
+ </description>
+ <operation name="notifyUpdate">
+ <actionMapping>http://ws.apache.org/ws/2007/05/eventing-extended/Publish</actionMapping>
+ <messageReceiver mep="http://www.w3.org/ns/wsdl/in-only"
+ class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
+ </operation>
+ <parameter name="ServiceClass">org.wso2.carbon.deployment.synchronizer.services.AutoCheckoutService</parameter>
</service>
- <parameter name="AuthorizationAction" locked="true">/permission/admin/configure/deployment_sync</parameter>
- <parameter name="adminService" locked="true">true</parameter>
- <parameter name="hiddenService" locked="true">true</parameter>
</serviceGroup>
\ No newline at end of file
More information about the Carbon-commits
mailing list