You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/07/28 10:22:55 UTC
svn commit: r426431 [14/14] - in /incubator/activemq/branches/activemq-4.0:
activemq-core/src/gram/script/
activemq-core/src/main/java/org/apache/activemq/kaha/impl/
activemq-core/src/main/java/org/apache/activemq/openwire/v1/
activemq-core/src/test/ja...
Propchange: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/ppr/util/MapItemHolder.hpp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/ppr/util/Time.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/ppr/util/Time.cpp?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/ppr/util/Time.cpp (original)
+++ incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/ppr/util/Time.cpp Fri Jul 28 01:22:48 2006
@@ -1,63 +1,63 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * 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.
- */
-#include "ppr/util/Time.hpp"
-
-using namespace apache::ppr::util;
-
-/*
- *
- */
-Time::Time()
-{
- // no-op
-}
-
-/*
- *
- */
-Time::~Time()
-{
- // no-op
-}
-
-/*
- * Returns number of milliseconds since 1 Jan 1970 (UTC).
- */
-long long Time::getCurrentTimeMillis()
-{
- long long millis ;
-
-#ifdef unix
- struct timeval tv ;
- struct timezone tz ;
-
- gettimeofday(&tv, &tz) ;
-
- millis = tv.tv_sec ;
- millis += tv.tv_usec / 1000 ;
-#else
- __time64_t ltime ;
- struct __timeb64 tstruct ;
-
- _time64( <ime ) ;
- _ftime64( &tstruct ) ;
-
- millis = ltime * 1000 ;
- millis += tstruct.millitm ;
-#endif
- return millis ;
-}
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * 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.
+ */
+#include "ppr/util/Time.hpp"
+
+using namespace apache::ppr::util;
+
+/*
+ *
+ */
+Time::Time()
+{
+ // no-op
+}
+
+/*
+ *
+ */
+Time::~Time()
+{
+ // no-op
+}
+
+/*
+ * Returns number of milliseconds since 1 Jan 1970 (UTC).
+ */
+long long Time::getCurrentTimeMillis()
+{
+ long long millis ;
+
+#ifdef unix
+ struct timeval tv ;
+ struct timezone tz ;
+
+ gettimeofday(&tv, &tz) ;
+
+ millis = tv.tv_sec ;
+ millis += tv.tv_usec / 1000 ;
+#else
+ __time64_t ltime ;
+ struct __timeb64 tstruct ;
+
+ _time64( <ime ) ;
+ _ftime64( &tstruct ) ;
+
+ millis = ltime * 1000 ;
+ millis += tstruct.millitm ;
+#endif
+ return millis ;
+}
Propchange: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/ppr/util/Time.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/ppr/util/Time.hpp
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/ppr/util/Time.hpp?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/ppr/util/Time.hpp (original)
+++ incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/ppr/util/Time.hpp Fri Jul 28 01:22:48 2006
@@ -1,53 +1,53 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * 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.
- */
-#ifndef Ppr_Time_hpp_
-#define Ppr_Time_hpp_
-
-#ifdef unix
-#include <sys/time.h>
-#else
-#include <time.h>
-#include <sys/timeb.h>
-#endif
-
-namespace apache
-{
- namespace ppr
- {
- namespace util
- {
-
-/*
- * Helper class with time functions.
- */
-class Time
-{
-private:
- Time() ;
-
-public:
- ~Time() ;
-
- static long long getCurrentTimeMillis() ;
-} ;
-
-/* namespace */
- }
- }
-}
-
-#endif /*Ppr_Time_hpp_*/
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * 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.
+ */
+#ifndef Ppr_Time_hpp_
+#define Ppr_Time_hpp_
+
+#ifdef unix
+#include <sys/time.h>
+#else
+#include <time.h>
+#include <sys/timeb.h>
+#endif
+
+namespace apache
+{
+ namespace ppr
+ {
+ namespace util
+ {
+
+/*
+ * Helper class with time functions.
+ */
+class Time
+{
+private:
+ Time() ;
+
+public:
+ ~Time() ;
+
+ static long long getCurrentTimeMillis() ;
+} ;
+
+/* namespace */
+ }
+ }
+}
+
+#endif /*Ppr_Time_hpp_*/
Propchange: incubator/activemq/branches/activemq-4.0/openwire-cpp/src/main/cpp/ppr/util/Time.hpp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/branches/activemq-4.0/systest/weblogic-test/ActiveMQRAR/connectorModule/META-INF/weblogic-ra.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/systest/weblogic-test/ActiveMQRAR/connectorModule/META-INF/weblogic-ra.xml?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/systest/weblogic-test/ActiveMQRAR/connectorModule/META-INF/weblogic-ra.xml (original)
+++ incubator/activemq/branches/activemq-4.0/systest/weblogic-test/ActiveMQRAR/connectorModule/META-INF/weblogic-ra.xml Fri Jul 28 01:22:48 2006
@@ -1,48 +1,48 @@
-<?xml version = "1.0"?>
-<!--
- 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.
--->
-<weblogic-connector xmlns="http://www.bea.com/ns/weblogic/90">
-<!--
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.bea.com/ns/weblogic/90 http://www.bea.com/ns/weblogic/90/weblogic-ra.xsd">
- -->
-
- <jndi-name>activemq/ResourceAdapter</jndi-name>
-
- <outbound-resource-adapter>
- <connection-definition-group>
- <connection-factory-interface>
- javax.jms.ConnectionFactory
- </connection-factory-interface>
- <connection-instance>
- <jndi-name>activemq/ConnectionFactory</jndi-name>
-
- <connection-properties>
- <properties>
- <property>
- <name>ConnectionURL</name>
- <value>
- jdbc:pointbase:server://localhost/demo
- </value>
- </property>
- </properties>
- </connection-properties>
-
- </connection-instance>
- </connection-definition-group>
- </outbound-resource-adapter>
-
-</weblogic-connector>
+<?xml version = "1.0"?>
+<!--
+ 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.
+-->
+<weblogic-connector xmlns="http://www.bea.com/ns/weblogic/90">
+<!--
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.bea.com/ns/weblogic/90 http://www.bea.com/ns/weblogic/90/weblogic-ra.xsd">
+ -->
+
+ <jndi-name>activemq/ResourceAdapter</jndi-name>
+
+ <outbound-resource-adapter>
+ <connection-definition-group>
+ <connection-factory-interface>
+ javax.jms.ConnectionFactory
+ </connection-factory-interface>
+ <connection-instance>
+ <jndi-name>activemq/ConnectionFactory</jndi-name>
+
+ <connection-properties>
+ <properties>
+ <property>
+ <name>ConnectionURL</name>
+ <value>
+ jdbc:pointbase:server://localhost/demo
+ </value>
+ </property>
+ </properties>
+ </connection-properties>
+
+ </connection-instance>
+ </connection-definition-group>
+ </outbound-resource-adapter>
+
+</weblogic-connector>
Propchange: incubator/activemq/branches/activemq-4.0/systest/weblogic-test/ActiveMQRAR/connectorModule/META-INF/weblogic-ra.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/branches/activemq-4.0/systest/weblogic-test/ExampleEJB/ejbModule/org/apache/activemq/example/CounterMDB.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/systest/weblogic-test/ExampleEJB/ejbModule/org/apache/activemq/example/CounterMDB.java?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/systest/weblogic-test/ExampleEJB/ejbModule/org/apache/activemq/example/CounterMDB.java (original)
+++ incubator/activemq/branches/activemq-4.0/systest/weblogic-test/ExampleEJB/ejbModule/org/apache/activemq/example/CounterMDB.java Fri Jul 28 01:22:48 2006
@@ -1,79 +1,79 @@
-/**
- *
- * 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.
- */
-package org.apache.activemq.example;
-
-import javax.ejb.MessageDrivenBean;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.naming.InitialContext;
-
-import weblogic.ejb.GenericMessageDrivenBean;
-import weblogic.ejbgen.ActivationConfigProperties;
-import weblogic.ejbgen.ActivationConfigProperty;
-import weblogic.ejbgen.MessageDriven;
-import weblogic.ejbgen.ResourceRef;
-
-/**
- * A simple MDB that demonstrates receiving and sending messages via ActiveMQ.
- *
- */
-@MessageDriven(ejbName = "CounterMDB", destinationType = "javax.jms.Queue", resourceAdapterJndiName = "activemq/ResourceAdapter", maxSuspendSeconds = 0)
-@ActivationConfigProperties(value = { @ActivationConfigProperty(name = "destination", value = "BAR") })
-@ResourceRef(jndiName = "activemq/ConnectionFactory", type = "javax.jms.ConnectionFactory", auth = ResourceRef.Auth.APPLICATION, name = "cf", id = "cf", sharingScope = ResourceRef.SharingScope.SHAREABLE)
-public class CounterMDB extends GenericMessageDrivenBean implements
- MessageDrivenBean, MessageListener {
-
- private static final long serialVersionUID = 1L;
-
- private static int counter = 0;
-
- public void onMessage(Message msg) {
- System.out.println("Got: " + msg);
- incrementCounter();
-
- // Try to forward the Message.
- try {
- InitialContext ic = new InitialContext();
- ConnectionFactory cf = (ConnectionFactory) ic.lookup("java:comp/env/cf");
- ic.close();
- Connection connection = cf.createConnection();
- try {
- Session session = connection.createSession(false, 0);
- MessageProducer producer = session.createProducer(session.createQueue("FOO"));
- producer.send(msg);
- } finally {
- connection.close();
- }
-
- } catch (Exception e) {
- System.out.println("Could not forward the message.");
- e.printStackTrace();
- }
- }
-
- public static synchronized void incrementCounter() {
- counter++;
- }
-
- public static synchronized int getCounter() {
- return counter;
- }
+/**
+ *
+ * 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.
+ */
+package org.apache.activemq.example;
+
+import javax.ejb.MessageDrivenBean;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.naming.InitialContext;
+
+import weblogic.ejb.GenericMessageDrivenBean;
+import weblogic.ejbgen.ActivationConfigProperties;
+import weblogic.ejbgen.ActivationConfigProperty;
+import weblogic.ejbgen.MessageDriven;
+import weblogic.ejbgen.ResourceRef;
+
+/**
+ * A simple MDB that demonstrates receiving and sending messages via ActiveMQ.
+ *
+ */
+@MessageDriven(ejbName = "CounterMDB", destinationType = "javax.jms.Queue", resourceAdapterJndiName = "activemq/ResourceAdapter", maxSuspendSeconds = 0)
+@ActivationConfigProperties(value = { @ActivationConfigProperty(name = "destination", value = "BAR") })
+@ResourceRef(jndiName = "activemq/ConnectionFactory", type = "javax.jms.ConnectionFactory", auth = ResourceRef.Auth.APPLICATION, name = "cf", id = "cf", sharingScope = ResourceRef.SharingScope.SHAREABLE)
+public class CounterMDB extends GenericMessageDrivenBean implements
+ MessageDrivenBean, MessageListener {
+
+ private static final long serialVersionUID = 1L;
+
+ private static int counter = 0;
+
+ public void onMessage(Message msg) {
+ System.out.println("Got: " + msg);
+ incrementCounter();
+
+ // Try to forward the Message.
+ try {
+ InitialContext ic = new InitialContext();
+ ConnectionFactory cf = (ConnectionFactory) ic.lookup("java:comp/env/cf");
+ ic.close();
+ Connection connection = cf.createConnection();
+ try {
+ Session session = connection.createSession(false, 0);
+ MessageProducer producer = session.createProducer(session.createQueue("FOO"));
+ producer.send(msg);
+ } finally {
+ connection.close();
+ }
+
+ } catch (Exception e) {
+ System.out.println("Could not forward the message.");
+ e.printStackTrace();
+ }
+ }
+
+ public static synchronized void incrementCounter() {
+ counter++;
+ }
+
+ public static synchronized int getCounter() {
+ return counter;
+ }
}
Propchange: incubator/activemq/branches/activemq-4.0/systest/weblogic-test/ExampleEJB/ejbModule/org/apache/activemq/example/CounterMDB.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/branches/activemq-4.0/systest/weblogic-test/ExampleWAR/WebContent/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/systest/weblogic-test/ExampleWAR/WebContent/WEB-INF/web.xml?rev=426431&r1=426430&r2=426431&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/systest/weblogic-test/ExampleWAR/WebContent/WEB-INF/web.xml (original)
+++ incubator/activemq/branches/activemq-4.0/systest/weblogic-test/ExampleWAR/WebContent/WEB-INF/web.xml Fri Jul 28 01:22:48 2006
@@ -1,28 +1,28 @@
-<?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
-
- 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.
--->
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>
- ExampleWAR</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
-</web-app>
+<?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
+
+ 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.
+-->
+<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+ <display-name>
+ ExampleWAR</display-name>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
Propchange: incubator/activemq/branches/activemq-4.0/systest/weblogic-test/ExampleWAR/WebContent/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native