Sorry i forgot to add a svn log for this commit. Pressed enter by mistake before i type the log message. This is part of the process of creating MB2 Alpha i m in the process of creating MB pack with new dependencies.
--Charith On Mon, Mar 5, 2012 at 2:47 PM, <[email protected]> wrote: > Author: charith > Date: Mon Mar 5 04:17:32 2012 > New Revision: 121994 > URL: http://wso2.org/svn/browse/wso2?view=rev&revision=121994 > > Log: > > > Added: > trunk/graphite/dependencies/orbit/andes/ > trunk/graphite/dependencies/orbit/andes/pom.xml > trunk/graphite/dependencies/orbit/andes/src/ > trunk/graphite/dependencies/orbit/andes/src/main/ > trunk/graphite/dependencies/orbit/andes/src/main/java/ > trunk/graphite/dependencies/orbit/andes/src/main/java/org/ > trunk/graphite/dependencies/orbit/andes/src/main/java/org/wso2/ > trunk/graphite/dependencies/orbit/andes/src/main/java/org/wso2/andes/ > > trunk/graphite/dependencies/orbit/andes/src/main/java/org/wso2/andes/wso2/ > > trunk/graphite/dependencies/orbit/andes/src/main/java/org/wso2/andes/wso2/internal/ > > trunk/graphite/dependencies/orbit/andes/src/main/java/org/wso2/andes/wso2/internal/QpidBundleActivator.java > > trunk/graphite/dependencies/orbit/andes/src/main/java/org/wso2/andes/wso2/service/ > > trunk/graphite/dependencies/orbit/andes/src/main/java/org/wso2/andes/wso2/service/QpidNotificationService.java > > trunk/graphite/dependencies/orbit/andes/src/main/java/org/wso2/andes/wso2/service/QpidNotificationServiceImpl.java > trunk/graphite/dependencies/orbit/andes/src/main/resources/ > > trunk/graphite/dependencies/orbit/andes/src/main/resources/qpidversion.properties > > Added: trunk/graphite/dependencies/orbit/andes/pom.xml > URL: > http://wso2.org/svn/browse/wso2/trunk/graphite/dependencies/orbit/andes/pom.xml?pathrev=121994 > > ============================================================================== > --- (empty file) > +++ trunk/graphite/dependencies/orbit/andes/pom.xml Mon Mar 5 > 04:17:32 2012 > @@ -0,0 +1,173 @@ > +<!-- > + ~ Copyright (c) 2005-2011, WSO2 Inc. (http://www.wso2.org) All Rights > Reserved. > + ~ > + ~ WSO2 Inc. licenses this file to you under the Apache License, > + ~ Version 2.0 (the "License"); you may not use this file except > + ~ in compliance with the License. > + ~ You may obtain a copy of the License at > + ~ > + ~ http://www.apache.org/licenses/LICENSE-2.0 > + ~ > + ~ Unless required by applicable law or agreed to in writing, > + ~ software distributed under the License is distributed on an > + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY > + ~ KIND, either express or implied. See the License for the > + ~ specific language governing permissions and limitations > + ~ under the License. > + --> > +<project xmlns="http://maven.apache.org/POM/4.0.0"; > + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; > + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 > http://maven.apache.org/maven-v4_0_0.xsd";> > + > + <parent> > + <groupId>org.wso2.carbon</groupId> > + <artifactId>carbon-dependents</artifactId> > + <version>4.0.0-SNAPSHOT</version> > + <relativePath>../../pom.xml</relativePath> > + </parent> > + > + <modelVersion>4.0.0</modelVersion> > + <groupId>org.wso2.andes.wso2</groupId> > + <artifactId>andes</artifactId> > + <packaging>bundle</packaging> > + <name>WSO2 Carbon - Orbit - andes</name> > + <version>${andes.orbit.version}</version> > + <description>This bundle exports packages from qpid jar > files</description> > + <url>http://wso2.org</url> > + > + <dependencies> > + <dependency> > + <groupId>org.wso2.andes</groupId> > + <artifactId>andes-client</artifactId> > + <version>${andes.version}</version> > + <optional>true</optional> > + </dependency> > + <dependency> > + <groupId>org.wso2.andes</groupId> > + <artifactId>andes-broker</artifactId> > + <version>${andes.version}</version> > + <optional>true</optional> > + </dependency> > + <dependency> > + <groupId>org.wso2.andes</groupId> > + <artifactId>andes-common</artifactId> > + <version>${andes.version}</version> > + <optional>true</optional> > + </dependency> > + <dependency> > + <groupId>org.wso2.andes</groupId> > + <artifactId>andes-management-common</artifactId> > + <version>${andes.version}</version> > + <optional>true</optional> > + </dependency> > + <dependency> > + <groupId>commons-logging</groupId> > + <artifactId>commons-logging</artifactId> > + <version>${version.commons.logging}</version> > + <optional>true</optional> > + </dependency> > + <dependency> > + <groupId>commons-configuration.wso2</groupId> > + <artifactId>commons-configuration</artifactId> > + <version>${commons-configuration.version}.wso2v1</version> > + <optional>true</optional> > + </dependency> > + <dependency> > + <groupId>org.apache.geronimo.specs.wso2</groupId> > + <artifactId>geronimo-jms_1.1_spec</artifactId> > + <version>${geronimo-jms_1.1_spec.version}.wso2v1</version> > + <optional>true</optional> > + </dependency> > + <dependency> > + <groupId>org.apache.mina</groupId> > + <artifactId>mina-core</artifactId> > + <version>${mina-core.version}</version> > + <optional>true</optional> > + <exclusions> > + <exclusion> > + <groupId>backport-util-concurrent</groupId> > + <artifactId>backport-util-concurrent</artifactId> > + </exclusion> > + </exclusions> > + </dependency> > + <dependency> > + <groupId>org.apache.mina</groupId> > + <artifactId>mina-filter-ssl</artifactId> > + <version>${mina-filter-ssl.version}</version> > + </dependency> > + <dependency> > + <groupId>org.apache.derby</groupId> > + <artifactId>derby</artifactId> > + <version>${derby.version}</version> > + <optional>true</optional> > + </dependency> > + <dependency> > + <groupId>org.eclipse.osgi</groupId> > + <artifactId>org.eclipse.osgi</artifactId> > + <version>3.5.0.v20090520</version> > + <optional>true</optional> > + </dependency> > + <dependency> > + <groupId>org.eclipse.osgi</groupId> > + <artifactId>org.eclipse.osgi.services</artifactId> > + <version>3.2.0.v20090520-1800</version> > + <optional>true</optional> > + </dependency> > + </dependencies> > + > + <build> > + <plugins> > + <plugin> > + <groupId>org.apache.felix</groupId> > + <artifactId>maven-bundle-plugin</artifactId> > + > + <extensions>true</extensions> > + <configuration> > + <instructions> > + > <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> > + <Bundle-Name>${project.artifactId}</Bundle-Name> > + > <Private-Package>org.wso2.andes.wso2.internal.*</Private-Package> > + <Export-Package> > + !org.wso2.andes.wso2.internal.*, > + !org.apache.log4j.xml.*, > + org.wso2.andes.wso2.service.*, > + > org.apache.mina.transport.vmpipe;-split-package:=merge-last, > + org.apache.derby.jdbc, > + org.apache.qpid.*;-split-package:=merge-last, > + org.apache.mina.*;-split-package:=merge-last > + </Export-Package> > + <Import-Package> > + !org.apache.qpid.*, > + !org.apache.derby.*, > + org.apache.commons.cli.*;version="1.2", > + > org.apache.commons.configuration.*;version="1.6", > + org.apache.commons.lang.*;version="2.3", > + org.apache.commons.logging.*, > + > org.wso2.carbon.qpid.authentication.qpid, > + <!--javax.jms.*,--> > + *;resolution:=optional > + </Import-Package> > + > > <Embed-Dependency>mina-core|derby;scope=compile|runtime;inline=false;</Embed-Dependency> > + > <Include-Resource>src/main/resources</Include-Resource> > + > <Bundle-Activator>org.wso2.andes.wso2.internal.QpidBundleActivator</Bundle-Activator> > + </instructions> > + </configuration> > + </plugin> > + </plugins> > + </build> > + > + <properties> > + <andes.build.version>0.13</andes.build.version> > + <andes.version>${andes.build.version}-wso2v1</andes.version> > + > <andes.orbit.version>${andes.build.version}.wso2v1</andes.orbit.version> > + <commons-cli.version>1.2.0</commons-cli.version> > + > <commons-configuration.version>1.6.0</commons-configuration.version> > + <commons-lang.version>2.3.0</commons-lang.version> > + > <geronimo-jms_1.1_spec.version>1.1.0</geronimo-jms_1.1_spec.version> > + <mina-core.version>1.0.1</mina-core.version> > + <mina-filter-ssl.version>1.0.1</mina-filter-ssl.version> > + <derby.version>10.4.2.0</derby.version> > + <version.commons.logging>1.1.1</version.commons.logging> > + </properties> > + > +</project> > > Added: > trunk/graphite/dependencies/orbit/andes/src/main/java/org/wso2/andes/wso2/internal/QpidBundleActivator.java > URL: > http://wso2.org/svn/browse/wso2/trunk/graphite/dependencies/orbit/andes/src/main/java/org/wso2/andes/wso2/internal/QpidBundleActivator.java?pathrev=121994 > > ============================================================================== > --- (empty file) > +++ > trunk/graphite/dependencies/orbit/andes/src/main/java/org/wso2/andes/wso2/internal/QpidBundleActivator.java > Mon Mar 5 04:17:32 2012 > @@ -0,0 +1,58 @@ > +/* > + * Copyright (c) 2008, WSO2 Inc. (http://www.wso2.org) All Rights > Reserved. > + * > + * Licensed under the Apache License, Version 2.0 (the "License"); > + * you may not use this file except in compliance with the License. > + * You may obtain a copy of the License at > + * > + * http://www.apache.org/licenses/LICENSE-2.0 > + * > + * Unless required by applicable law or agreed to in writing, software > + * distributed under the License is distributed on an "AS IS" BASIS, > + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or > implied. > + * See the License for the specific language governing permissions and > + * limitations under the License. > + */ > + > +package org.wso2.andes.wso2.internal; > + > +import org.apache.qpid.server.plugins.PluginManager; > +import org.apache.commons.logging.LogFactory; > +import org.apache.commons.logging.Log; > +import org.osgi.framework.BundleActivator; > +import org.osgi.framework.BundleContext; > +import org.osgi.framework.ServiceRegistration; > +import org.wso2.andes.wso2.service.QpidNotificationService; > +import org.wso2.andes.wso2.service.QpidNotificationServiceImpl; > + > +/** > + * This class implements the OSGi bundle activator for the Carbonized > Qpid. > + */ > +public final class QpidBundleActivator implements BundleActivator { > + > + private static final Log log = > LogFactory.getLog(QpidBundleActivator.class); > + private ServiceRegistration qpidNotificationServiceReg = null; > + > + public void start(BundleContext ctx) throws Exception { > + // Setting BundleContext in PluginManager will prevent Felix from > starting > + // when Qpid is inside another host OSGi container. > + log.info("Setting BundleContext in PluginManager"); > + PluginManager.setBundleContext(ctx); > + > + // Register service that exposes Qpid properties > + qpidNotificationServiceReg = > ctx.registerService(QpidNotificationService.class.getName(), > + new > QpidNotificationServiceImpl(), null); > + } > + > + public void stop(BundleContext ctx) throws Exception { > + // Qpid enables the system property "log4j.defaultInitOverride" > to prevent it's logging module > + // from wondering off and picking up the first > log4j.xml/properties file it finds on the classpath. > + // Unless we disable that, Carbon logging gets busted when it is > restarted. > + System.clearProperty("log4j.defaultInitOverride"); > + > + // Unregister notification service > + if (null != qpidNotificationServiceReg) { > + qpidNotificationServiceReg.unregister(); > + } > + } > +} > > Added: > trunk/graphite/dependencies/orbit/andes/src/main/java/org/wso2/andes/wso2/service/QpidNotificationService.java > URL: > http://wso2.org/svn/browse/wso2/trunk/graphite/dependencies/orbit/andes/src/main/java/org/wso2/andes/wso2/service/QpidNotificationService.java?pathrev=121994 > > ============================================================================== > --- (empty file) > +++ > trunk/graphite/dependencies/orbit/andes/src/main/java/org/wso2/andes/wso2/service/QpidNotificationService.java > Mon Mar 5 04:17:32 2012 > @@ -0,0 +1,32 @@ > +/* > + * Copyright (c) 2008, WSO2 Inc. (http://www.wso2.org) All Rights > Reserved. > + * > + * Licensed under the Apache License, Version 2.0 (the "License"); > + * you may not use this file except in compliance with the License. > + * You may obtain a copy of the License at > + * > + * http://www.apache.org/licenses/LICENSE-2.0 > + * > + * Unless required by applicable law or agreed to in writing, software > + * distributed under the License is distributed on an "AS IS" BASIS, > + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or > implied. > + * See the License for the specific language governing permissions and > + * limitations under the License. > + */ > + > +package org.wso2.andes.wso2.service; > + > +/** > + * This is a declarative service interface for exposing Qpid attributes to > + * the OSGi runtime. > + */ > +public interface QpidNotificationService { > + > + // Qpid version > + public String getVersion(); > + public void setVersion(String version); > + > + // Qpid build number > + public String getBuildNumber(); > + public void setBuildNumber(String buildNumber); > +} > > Added: > trunk/graphite/dependencies/orbit/andes/src/main/java/org/wso2/andes/wso2/service/QpidNotificationServiceImpl.java > URL: > http://wso2.org/svn/browse/wso2/trunk/graphite/dependencies/orbit/andes/src/main/java/org/wso2/andes/wso2/service/QpidNotificationServiceImpl.java?pathrev=121994 > > ============================================================================== > --- (empty file) > +++ > trunk/graphite/dependencies/orbit/andes/src/main/java/org/wso2/andes/wso2/service/QpidNotificationServiceImpl.java > Mon Mar 5 04:17:32 2012 > @@ -0,0 +1,74 @@ > +/* > + * Copyright (c) 2008, WSO2 Inc. (http://www.wso2.org) All Rights > Reserved. > + * > + * Licensed under the Apache License, Version 2.0 (the "License"); > + * you may not use this file except in compliance with the License. > + * You may obtain a copy of the License at > + * > + * http://www.apache.org/licenses/LICENSE-2.0 > + * > + * Unless required by applicable law or agreed to in writing, software > + * distributed under the License is distributed on an "AS IS" BASIS, > + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or > implied. > + * See the License for the specific language governing permissions and > + * limitations under the License. > + */ > + > +package org.wso2.andes.wso2.service; > + > +import org.apache.commons.logging.Log; > +import org.apache.commons.logging.LogFactory; > +import java.io.IOException; > +import java.io.InputStream; > +import java.util.Properties; > + > +/** > + * This is a declarative service for exposing Qpid attributes to the OSGi > runtime. > + */ > +public class QpidNotificationServiceImpl implements > QpidNotificationService { > + > + private static final Log log = > LogFactory.getLog(QpidNotificationServiceImpl.class); > + > + private String VERSION_INFO_PROP_FILE = "/qpidversion.properties"; > + private String KEY_VERSION = "qpid.version"; > + private String KEY_BUILD_NUMBER = "qpid.svnversion"; > + > + String version = ""; > + String buildNumber = ""; > + > + public QpidNotificationServiceImpl() { > + setVersionInfo(); > + } > + > + public String getVersion() { > + return version; > + } > + > + public void setVersion(String version) { > + this.version = version; > + } > + > + public String getBuildNumber() { > + return buildNumber; > + } > + > + public void setBuildNumber(String buildNumber) { > + this.buildNumber = buildNumber; > + } > + > + private void setVersionInfo() { > + try { > + Properties props = new Properties(); > + InputStream is = > this.getClass().getResourceAsStream(VERSION_INFO_PROP_FILE); > + props.load(is); > + > + // Read Qpid version > + version = props.getProperty(KEY_VERSION); > + > + // Read build number > + buildNumber = props.getProperty(KEY_BUILD_NUMBER); > + } catch (IOException e) { > + log.warn("Failed to load " + VERSION_INFO_PROP_FILE); > + } > + } > +} > > Added: > trunk/graphite/dependencies/orbit/andes/src/main/resources/qpidversion.properties > URL: > http://wso2.org/svn/browse/wso2/trunk/graphite/dependencies/orbit/andes/src/main/resources/qpidversion.properties?pathrev=121994 > > ============================================================================== > --- (empty file) > +++ > trunk/graphite/dependencies/orbit/andes/src/main/resources/qpidversion.properties > Mon Mar 5 04:17:32 2012 > @@ -0,0 +1,3 @@ > +qpid.version=0.11 > +qpid.svnversion=90784:90849 > +qpid.name=qpid > _______________________________________________ > Carbon-commits mailing list > [email protected] > https://wso2.org/cgi-bin/mailman/listinfo/carbon-commits > -- Charith Dhanushka Wickramarachchi Software Engineer WSO2 Inc http://wso2.com/ http://wso2.org/ blog http://charithwiki.blogspot.com/ twitter http://twitter.com/charithwiki Mobile : 0776706568
_______________________________________________ Carbon-dev mailing list [email protected] http://mail.wso2.org/cgi-bin/mailman/listinfo/carbon-dev
