You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2006/09/08 14:39:29 UTC
svn commit: r441486 - in /geronimo/server/branches/sachin: ./
applications/console/geronimo-console-standard/
applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/
configs/activemq-broker/ config...
Author: sppatel
Date: Fri Sep 8 05:39:28 2006
New Revision: 441486
URL: http://svn.apache.org/viewvc?view=rev&rev=441486
Log:
update from trunk
Modified:
geronimo/server/branches/sachin/applications/console/geronimo-console-standard/pom.xml
geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDLQRenderer.java
geronimo/server/branches/sachin/configs/activemq-broker/pom.xml
geronimo/server/branches/sachin/configs/activemq-broker/src/plan/plan.xml
geronimo/server/branches/sachin/configs/activemq/src/plan/plan.xml
geronimo/server/branches/sachin/configs/webconsole-jetty/pom.xml
geronimo/server/branches/sachin/configs/webconsole-tomcat/pom.xml
geronimo/server/branches/sachin/modules/ge-activemq-rar/pom.xml
geronimo/server/branches/sachin/modules/ge-activemq-rar/src/main/rar/META-INF/ra.xml
geronimo/server/branches/sachin/modules/geronimo-activemq-gbean/pom.xml
geronimo/server/branches/sachin/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java
geronimo/server/branches/sachin/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/management/ActiveMQManagerGBean.java
geronimo/server/branches/sachin/modules/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
geronimo/server/branches/sachin/pom.xml
Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-standard/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-standard/pom.xml?view=diff&rev=441486&r1=441485&r2=441486
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-standard/pom.xml (original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-standard/pom.xml Fri Sep 8 05:39:28 2006
@@ -112,7 +112,7 @@
<!-- JMS dependencies -->
<dependency>
- <groupId>activemq</groupId>
+ <groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
<scope>provided</scope>
</dependency>
Modified: geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDLQRenderer.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDLQRenderer.java?view=diff&rev=441486&r1=441485&r2=441486
==============================================================================
--- geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDLQRenderer.java (original)
+++ geronimo/server/branches/sachin/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDLQRenderer.java Fri Sep 8 05:39:28 2006
@@ -34,7 +34,7 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import org.activemq.service.DeadLetterPolicy;
+//import org.activemq.service.DeadLetterPolicy;
import org.apache.geronimo.console.jmsmanager.AbstractJMSManager;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.gbean.AbstractName;
@@ -59,6 +59,7 @@
}
public void setup(RenderRequest request, RenderResponse response) {
+ /*
String destinationApplicationName = request
.getParameter("destinationApplicationName");
String destinationModuleName = request
@@ -108,6 +109,7 @@
} catch (Exception e) {
log.error(e.getMessage(), e);
}
+ */
}
public List getDLQContents(QueueBrowser qb) {
Modified: geronimo/server/branches/sachin/configs/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/activemq-broker/pom.xml?view=diff&rev=441486&r1=441485&r2=441486
==============================================================================
--- geronimo/server/branches/sachin/configs/activemq-broker/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/activemq-broker/pom.xml Fri Sep 8 05:39:28 2006
@@ -43,40 +43,27 @@
</dependency>
<dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-activemq-gbean</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-activemq-gbean-management</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-gbean-g1_1</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
</dependency>
-
+
<dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-gbean-management-g1_1</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activeio-core</artifactId>
</dependency>
-
+
</dependencies>
-
- <!--
- HACK: Currently need to pickup the Codehaus m1 repo for activemq-*:3.2.4-SNAPSHOT
- -->
- <repositories>
- <repository>
- <id>codehaus-m1</id>
- <name>Codehaus Maven 1 Repository</name>
- <url>http://dist.codehaus.org</url>
- <layout>legacy</layout>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
</project>
Modified: geronimo/server/branches/sachin/configs/activemq-broker/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/activemq-broker/src/plan/plan.xml?view=diff&rev=441486&r1=441485&r2=441486
==============================================================================
--- geronimo/server/branches/sachin/configs/activemq-broker/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/activemq-broker/src/plan/plan.xml Fri Sep 8 05:39:28 2006
@@ -19,59 +19,53 @@
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <gbean name="ActiveMQManager" class="org.activemq.gbean.management.ActiveMQManagerGBean"/>
+ <gbean name="ActiveMQManager" class="org.apache.activemq.gbean.management.ActiveMQManagerGBean"/>
- <gbean name="ActiveMQ" class="org.activemq.gbean.ActiveMQContainerGBean">
+ <gbean name="ActiveMQ" class="org.apache.activemq.gbean.BrokerServiceGBeanImpl">
+ <!-- Instead of using the limited configuration syntax in this file,
+ you can set the brokerURI property to externally specify the configuration for
+ the broker.
+ <attribute name="brokerURI">xbean:file:/path/to/activemq.xml</attribute>
+ -->
<attribute name="brokerName">possibly-unique-broker</attribute>
- <reference name="persistenceAdapter">
- <name>ActiveMQ.cache</name>
+ <attribute name="dataDirectory">activemq-data</attribute>
+ <reference name="dataSource">
+ <name>SystemDatasource</name>
</reference>
- <reference name="JMSManager">
+ <reference name="manager">
<name>ActiveMQManager</name>
</reference>
<dependency>
<name>SystemProperties</name>
</dependency>
- </gbean>
-
- <gbean name="ActiveMQ.cache" class="org.activemq.store.cache.SimpleCachePersistenceAdapterGBean">
- <attribute name="cacheSize">10000</attribute>
- <reference name="longTermPersistence">
- <name>ActiveMQ.journal</name>
- </reference>
- </gbean>
-
- <gbean name="ActiveMQ.journal" class="org.activemq.store.journal.JournalPersistenceAdapterGBean">
<reference name="serverInfo">
<name>ServerInfo</name>
</reference>
- <attribute name="directory">var/activemq/journal</attribute>
- <attribute name="journalType">default</attribute>
- <reference name="longTermPersistence">
- <name>ActiveMQ.jdbc</name>
- </reference>
</gbean>
- <gbean name="ActiveMQ.jdbc" class="org.activemq.store.jdbc.JDBCPersistenceAdapterGBean">
- <reference name="dataSource">
- <name>SystemDatasource</name>
+ <gbean name="ActiveMQ.tcp.default" class="org.apache.activemq.gbean.TransportConnectorGBeanImpl">
+ <attribute name="protocol">tcp</attribute>
+ <attribute name="host">localhost</attribute>
+ <attribute name="port">61616</attribute>
+ <reference name="brokerService">
+ <name>ActiveMQ</name>
</reference>
</gbean>
- <gbean name="ActiveMQ.tcp.default" class="org.activemq.gbean.ActiveMQConnectorGBean">
- <attribute name="protocol">tcp</attribute>
+ <gbean name="ActiveMQ.stomp.default" class="org.apache.activemq.gbean.TransportConnectorGBeanImpl">
+ <attribute name="protocol">stomp</attribute>
<attribute name="host">localhost</attribute>
- <attribute name="port">61616</attribute>
- <reference name="activeMQContainer">
+ <attribute name="port">61613</attribute>
+ <reference name="brokerService">
<name>ActiveMQ</name>
</reference>
</gbean>
- <gbean name="ActiveMQ.vm.localhost" class="org.activemq.gbean.ActiveMQConnectorGBean">
+ <gbean name="ActiveMQ.vm.default" class="org.apache.activemq.gbean.TransportConnectorGBeanImpl">
<attribute name="protocol">vm</attribute>
<attribute name="host">localhost</attribute>
<attribute name="port">-1</attribute>
- <reference name="activeMQContainer">
+ <reference name="brokerService">
<name>ActiveMQ</name>
</reference>
</gbean>
Modified: geronimo/server/branches/sachin/configs/activemq/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/activemq/src/plan/plan.xml?view=diff&rev=441486&r1=441485&r2=441486
==============================================================================
--- geronimo/server/branches/sachin/configs/activemq/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/activemq/src/plan/plan.xml Fri Sep 8 05:39:28 2006
@@ -52,7 +52,7 @@
</resourceadapter>
<adminobject>
<adminobject-interface>javax.jms.Queue</adminobject-interface>
- <adminobject-class>org.codehaus.activemq.message.ActiveMQQueue</adminobject-class>
+ <adminobject-class>org.apache.activemq.command.ActiveMQQueue</adminobject-class>
<adminobject-instance>
<message-destination-name>MDBTransferBeanOutQueue</message-destination-name>
<config-property-setting name="PhysicalName">MDBTransferBeanOutQueue</config-property-setting>
@@ -60,7 +60,7 @@
</adminobject>
<adminobject>
<adminobject-interface>javax.jms.Queue</adminobject-interface>
- <adminobject-class>org.codehaus.activemq.message.ActiveMQQueue</adminobject-class>
+ <adminobject-class>org.apache.activemq.command.ActiveMQQueue</adminobject-class>
<adminobject-instance>
<message-destination-name>SendReceiveQueue</message-destination-name>
<config-property-setting name="PhysicalName">SendReceiveQueue</config-property-setting>
Modified: geronimo/server/branches/sachin/configs/webconsole-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/webconsole-jetty/pom.xml?view=diff&rev=441486&r1=441485&r2=441486
==============================================================================
--- geronimo/server/branches/sachin/configs/webconsole-jetty/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/webconsole-jetty/pom.xml Fri Sep 8 05:39:28 2006
@@ -129,13 +129,15 @@
<!--</dependency>-->
<dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-gbean-g1_1</artifactId>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-activemq-gbean</artifactId>
+ <version>${pom.version}</version>
</dependency>
-
+
<dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-gbean-management-g1_1</artifactId>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-activemq-gbean-management</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
Modified: geronimo/server/branches/sachin/configs/webconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/webconsole-tomcat/pom.xml?view=diff&rev=441486&r1=441485&r2=441486
==============================================================================
--- geronimo/server/branches/sachin/configs/webconsole-tomcat/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/webconsole-tomcat/pom.xml Fri Sep 8 05:39:28 2006
@@ -128,14 +128,17 @@
<!--<version>${pom.version}</version>-->
<!--</dependency>-->
+
<dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-gbean-g1_1</artifactId>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-activemq-gbean</artifactId>
+ <version>${pom.version}</version>
</dependency>
-
+
<dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-gbean-management-g1_1</artifactId>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-activemq-gbean-management</artifactId>
+ <version>${pom.version}</version>
</dependency>
<dependency>
Modified: geronimo/server/branches/sachin/modules/ge-activemq-rar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/ge-activemq-rar/pom.xml?view=diff&rev=441486&r1=441485&r2=441486
==============================================================================
--- geronimo/server/branches/sachin/modules/ge-activemq-rar/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/ge-activemq-rar/pom.xml Fri Sep 8 05:39:28 2006
@@ -36,12 +36,12 @@
<dependencies>
<dependency>
- <groupId>activemq</groupId>
+ <groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
</dependency>
<dependency>
- <groupId>activemq</groupId>
+ <groupId>org.apache.activemq</groupId>
<artifactId>activemq-ra</artifactId>
</dependency>
@@ -57,25 +57,5 @@
</plugin>
</plugins>
</build>
-
- <!--
- HACK: Currently need to pickup the Codehaus m1 repo for activemq-*:3.2.4-SNAPSHOT
- -->
- <repositories>
- <repository>
- <id>codehaus-m1</id>
- <name>Codehaus Maven 1 Repository</name>
- <url>http://dist.codehaus.org</url>
- <layout>legacy</layout>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
</project>
Modified: geronimo/server/branches/sachin/modules/ge-activemq-rar/src/main/rar/META-INF/ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/ge-activemq-rar/src/main/rar/META-INF/ra.xml?view=diff&rev=441486&r1=441485&r2=441486
==============================================================================
--- geronimo/server/branches/sachin/modules/ge-activemq-rar/src/main/rar/META-INF/ra.xml (original)
+++ geronimo/server/branches/sachin/modules/ge-activemq-rar/src/main/rar/META-INF/ra.xml Fri Sep 8 05:39:28 2006
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005-2006 The Apache Software Foundation
-
- 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
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF 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
@@ -27,26 +28,213 @@
<resourceadapter-version>1.0</resourceadapter-version>
<license>
<description>
-
- Copyright 2005-2006 The Apache Software Foundation
-
- 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.
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
</description>
<license-required>true</license-required>
</license>
<resourceadapter>
- <resourceadapter-class>org.activemq.ra.ActiveMQResourceAdapter</resourceadapter-class>
+ <resourceadapter-class>org.apache.activemq.ra.ActiveMQResourceAdapter</resourceadapter-class>
<config-property>
<description>
The URL to the ActiveMQ server that you want this connection to connect to. If using
@@ -81,7 +269,7 @@
<config-property-value>false</config-property-value>
</config-property>
- <!-- NOTE disable the following property if you do not wish to deploy an embedded broker -->
+ <!-- NOTE disable the following property if you do not wish to deploy an embedded broker -->
<config-property>
<description>
Sets the XML configuration file used to configure the embedded ActiveMQ broker via
@@ -102,25 +290,25 @@
<outbound-resourceadapter>
<connection-definition>
- <managedconnectionfactory-class>org.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
+ <managedconnectionfactory-class>org.apache.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
<connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
- <connectionfactory-impl-class>org.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
+ <connectionfactory-impl-class>org.apache.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
<connection-interface>javax.jms.Connection</connection-interface>
- <connection-impl-class>org.activemq.ra.ManagedConnectionProxy</connection-impl-class>
+ <connection-impl-class>org.apache.activemq.ra.ManagedConnectionProxy</connection-impl-class>
</connection-definition>
<connection-definition>
- <managedconnectionfactory-class>org.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
+ <managedconnectionfactory-class>org.apache.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
<connectionfactory-interface>javax.jms.QueueConnectionFactory</connectionfactory-interface>
- <connectionfactory-impl-class>org.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
+ <connectionfactory-impl-class>org.apache.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
<connection-interface>javax.jms.QueueConnection</connection-interface>
- <connection-impl-class>org.activemq.ra.ManagedConnectionProxy</connection-impl-class>
+ <connection-impl-class>org.apache.activemq.ra.ManagedConnectionProxy</connection-impl-class>
</connection-definition>
<connection-definition>
- <managedconnectionfactory-class>org.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
+ <managedconnectionfactory-class>org.apache.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>
<connectionfactory-interface>javax.jms.TopicConnectionFactory</connectionfactory-interface>
- <connectionfactory-impl-class>org.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
+ <connectionfactory-impl-class>org.apache.activemq.ra.ActiveMQConnectionFactory</connectionfactory-impl-class>
<connection-interface>javax.jms.TopicConnection</connection-interface>
- <connection-impl-class>org.activemq.ra.ManagedConnectionProxy</connection-impl-class>
+ <connection-impl-class>org.apache.activemq.ra.ManagedConnectionProxy</connection-impl-class>
</connection-definition>
<transaction-support>XATransaction</transaction-support>
<authentication-mechanism>
@@ -134,7 +322,7 @@
<messagelistener>
<messagelistener-type>javax.jms.MessageListener</messagelistener-type>
<activationspec>
- <activationspec-class>org.activemq.ra.ActiveMQActivationSpec</activationspec-class>
+ <activationspec-class>org.apache.activemq.ra.ActiveMQActivationSpec</activationspec-class>
<required-config-property>
<config-property-name>destination</config-property-name>
@@ -149,7 +337,7 @@
</inbound-resourceadapter>
<adminobject>
<adminobject-interface>javax.jms.Queue</adminobject-interface>
- <adminobject-class>org.activemq.message.ActiveMQQueue</adminobject-class>
+ <adminobject-class>org.apache.activemq.command.ActiveMQQueue</adminobject-class>
<config-property>
<config-property-name>PhysicalName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
@@ -157,7 +345,7 @@
</adminobject>
<adminobject>
<adminobject-interface>javax.jms.Topic</adminobject-interface>
- <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
+ <adminobject-class>org.apache.activemq.command.ActiveMQTopic</adminobject-class>
<config-property>
<config-property-name>PhysicalName</config-property-name>
<config-property-type>java.lang.String</config-property-type>
Modified: geronimo/server/branches/sachin/modules/geronimo-activemq-gbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-activemq-gbean/pom.xml?view=diff&rev=441486&r1=441485&r2=441486
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-activemq-gbean/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-activemq-gbean/pom.xml Fri Sep 8 05:39:28 2006
@@ -64,37 +64,15 @@
</dependency>
<dependency>
- <groupId>incubator-activemq</groupId>
+ <groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>4.0.1</version>
</dependency>
<dependency>
- <groupId>incubator-activemq</groupId>
+ <groupId>org.apache.activemq</groupId>
<artifactId>activeio-core</artifactId>
- <version>3.0-beta3</version>
</dependency>
</dependencies>
-
- <!--
- HACK: Need the Apache m1 snapshot repo to pick up incubator-activemq:*
- -->
- <repositories>
- <repository>
- <id>apache-snapshots-m1</id>
- <name>Apache Maven 1 Snapshots Repository</name>
- <url>http://people.apache.org/repo/m1-snapshot-repository</url>
- <layout>legacy</layout>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
</project>
Modified: geronimo/server/branches/sachin/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java?view=diff&rev=441486&r1=441485&r2=441486
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java Fri Sep 8 05:39:28 2006
@@ -68,7 +68,7 @@
brokerService = createContainer();
}
DefaultPersistenceAdapterFactory persistenceFactory = (DefaultPersistenceAdapterFactory) brokerService.getPersistenceFactory();
- persistenceFactory.setDataDirectory(serverInfo.resolve(dataDirectory));
+ persistenceFactory.setDataDirectory(serverInfo.resolvePath(dataDirectory));
persistenceFactory.setDataSource((DataSource) dataSource.$getResource());
brokerService.start();
} finally {
Modified: geronimo/server/branches/sachin/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/management/ActiveMQManagerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/management/ActiveMQManagerGBean.java?view=diff&rev=441486&r1=441485&r2=441486
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/management/ActiveMQManagerGBean.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/management/ActiveMQManagerGBean.java Fri Sep 8 05:39:28 2006
@@ -142,7 +142,7 @@
for (Iterator it = set.iterator(); it.hasNext();) {
AbstractName name = (AbstractName) it.next(); // a single Jetty connector
GBeanData data = kernel.getGBeanData(name);
- ReferencePatterns refs = data.getReferencePatterns("activeMQContainer");
+ ReferencePatterns refs = data.getReferencePatterns("brokerService");
if (containerName.equals(refs.getAbstractName())) {
results.add(mgr.createProxy(name, ActiveMQConnector.class.getClassLoader()));
}
@@ -166,7 +166,7 @@
for (Iterator it = set.iterator(); it.hasNext();) {
AbstractName name = (AbstractName) it.next(); // a single Jetty connector
GBeanData data = kernel.getGBeanData(name);
- ReferencePatterns refs = data.getReferencePatterns("activeMQContainer");
+ ReferencePatterns refs = data.getReferencePatterns("brokerService");
if(containerName.equals(refs.getAbstractName())) {
try {
String testProtocol = (String) kernel.getAttribute(name, "protocol");
Modified: geronimo/server/branches/sachin/modules/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java?view=diff&rev=441486&r1=441485&r2=441486
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java Fri Sep 8 05:39:28 2006
@@ -88,6 +88,7 @@
public static final String URL_PATTERN = "URLPattern";
public static final String GERONIMO_SERVICE = "GBean"; //copied in GBeanInfoBuilder to avoid dependencies in the wrong direction.
public static final String CORBA_SERVICE = "CORBABean";
+ public static final String CORBA_NAME_SERVICE = "CORBANameService";
public static final String JACC_MANAGER = "JACCManager";
public static final String SYSTEM_LOG = "SystemLog";
public static final String JAXR_CONNECTION_FACTORY = "JAXRConnectionFactory";
@@ -108,6 +109,8 @@
public static final String SERVLET_WEB_SERVICE_TEMPLATE = "ServletWebServiceTemplate";
public static final String CORBA_CSS = "CORBACSS";
public static final String CORBA_TSS = "CORBATSS";
+ public static final String CORBA_SSL = "CORBASSL";
+ public static final String ORB_CONFIG = "ORBConfig";
public static final String WEB_SERVICE_LINK = "WSLink";
public static final String KEY_GENERATOR = "KeyGenerator";
public static final String KEYSTORE_INSTANCE = "Keystore";
Modified: geronimo/server/branches/sachin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/pom.xml?view=diff&rev=441486&r1=441485&r2=441486
==============================================================================
--- geronimo/server/branches/sachin/pom.xml (original)
+++ geronimo/server/branches/sachin/pom.xml Fri Sep 8 05:39:28 2006
@@ -418,41 +418,23 @@
</dependency>
<dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>3.2.4-SNAPSHOT</version>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activeio-core</artifactId>
+ <version>3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-ra</artifactId>
- <version>3.2.4-SNAPSHOT</version>
-
- <!-- Can't be found anywhere -->
- <exclusions>
- <exclusion>
- <groupId>incubator-derby</groupId>
- <artifactId>derby</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!--
- FIXME: Remove these and use our modules/activemq-gbean* modules
- -->
-
- <dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-gbean-g1_1</artifactId>
- <version>3.2.4-SNAPSHOT</version>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>4.1-incubator-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-gbean-management-g1_1</artifactId>
- <version>3.2.4-SNAPSHOT</version>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ <version>4.1-incubator-SNAPSHOT</version>
</dependency>
-
+
<dependency>
<groupId>jdbm</groupId>
<artifactId>jdbm</artifactId>