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/10/19 21:13:30 UTC
svn commit: r465739 - in /incubator/activemq/trunk:
activemq-console/src/test/resources/
activemq-core/src/test/resources/org/apache/activemq/network/
activemq-repository-builder/ activemq-repository-builder/src/main/assembly/
activemq-tooling/ assembl...
Author: chirino
Date: Thu Oct 19 12:13:28 2006
New Revision: 465739
URL: http://svn.apache.org/viewvc?view=rev&rev=465739
Log:
setting the eol style to native
Modified:
incubator/activemq/trunk/activemq-console/src/test/resources/activemq.xml (contents, props changed)
incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker1.xml (contents, props changed)
incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker2.xml (contents, props changed)
incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker1.xml (contents, props changed)
incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker2.xml (contents, props changed)
incubator/activemq/trunk/activemq-repository-builder/pom.xml (props changed)
incubator/activemq/trunk/activemq-repository-builder/src/main/assembly/repo.xml (props changed)
incubator/activemq/trunk/activemq-tooling/pom.xml (contents, props changed)
incubator/activemq/trunk/assembly/src/main/descriptors/src-bin.xml (contents, props changed)
incubator/activemq/trunk/assembly/src/sample-conf/jdbc-example.xml (contents, props changed)
incubator/activemq/trunk/assembly/src/sample-conf/journaledMem-example.xml (contents, props changed)
incubator/activemq/trunk/assembly/src/sample-conf/kaha-example.xml (contents, props changed)
incubator/activemq/trunk/assembly/src/sample-conf/memory-example.xml (contents, props changed)
incubator/activemq/trunk/assembly/src/sample-conf/multicastNetwork-example.xml (contents, props changed)
incubator/activemq/trunk/assembly/src/sample-conf/quickJdbc-example.xml (contents, props changed)
incubator/activemq/trunk/assembly/src/sample-conf/quickMem-example.xml (contents, props changed)
incubator/activemq/trunk/assembly/src/sample-conf/rapid-example.xml (contents, props changed)
incubator/activemq/trunk/assembly/src/sample-conf/staticNetwork-example.xml (contents, props changed)
Modified: incubator/activemq/trunk/activemq-console/src/test/resources/activemq.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-console/src/test/resources/activemq.xml?view=diff&rev=465739&r1=465738&r2=465739
==============================================================================
--- incubator/activemq/trunk/activemq-console/src/test/resources/activemq.xml (original)
+++ incubator/activemq/trunk/activemq-console/src/test/resources/activemq.xml Thu Oct 19 12:13:28 2006
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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
-
- 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.
--->
-<!-- START SNIPPET: xbean -->
-<beans>
-
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <broker useJmx="false" xmlns="http://activemq.org/config/1.0">
-
- <persistenceAdapter>
- <journaledJDBC journalLogFiles="2" dataDirectory="target/foo"/>
- </persistenceAdapter>
-
- <transportConnectors>
- <transportConnector uri="tcp://localhost:61616"/>
- </transportConnectors>
-
- </broker>
-
-</beans>
-<!-- END SNIPPET: xbean -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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
+
+ 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.
+-->
+<!-- START SNIPPET: xbean -->
+<beans>
+
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+ <broker useJmx="false" xmlns="http://activemq.org/config/1.0">
+
+ <persistenceAdapter>
+ <journaledJDBC journalLogFiles="2" dataDirectory="target/foo"/>
+ </persistenceAdapter>
+
+ <transportConnectors>
+ <transportConnector uri="tcp://localhost:61616"/>
+ </transportConnectors>
+
+ </broker>
+
+</beans>
+<!-- END SNIPPET: xbean -->
Propchange: incubator/activemq/trunk/activemq-console/src/test/resources/activemq.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker1.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker1.xml?view=diff&rev=465739&r1=465738&r2=465739
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker1.xml (original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker1.xml Thu Oct 19 12:13:28 2006
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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
-
- 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.
--->
-<beans>
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
- <broker brokerName="broker1" persistent="false" useShutdownHook="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
-
- <!-- disabling the subscription recovery policy allows us take memory leaks easier -->
- <destinationPolicy>
- <policyMap>
- <policyEntries>
- <policyEntry topic=">">
- <subscriptionRecoveryPolicy>
- <noSubscriptionRecoveryPolicy />
- </subscriptionRecoveryPolicy>
- </policyEntry>
- </policyEntries></policyMap>
- </destinationPolicy>
-
- <transportConnectors>
- <transportConnector uri="tcp://localhost:61616"/>
- <transportConnector uri="vm://broker1"/>
- </transportConnectors>
-
- <networkConnectors>
- <networkConnector uri="static:(tcp://localhost:61617)"/>
- </networkConnectors>
-
- </broker>
-
-</beans>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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
+
+ 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.
+-->
+<beans>
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+ <broker brokerName="broker1" persistent="false" useShutdownHook="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+
+ <!-- disabling the subscription recovery policy allows us take memory leaks easier -->
+ <destinationPolicy>
+ <policyMap>
+ <policyEntries>
+ <policyEntry topic=">">
+ <subscriptionRecoveryPolicy>
+ <noSubscriptionRecoveryPolicy />
+ </subscriptionRecoveryPolicy>
+ </policyEntry>
+ </policyEntries></policyMap>
+ </destinationPolicy>
+
+ <transportConnectors>
+ <transportConnector uri="tcp://localhost:61616"/>
+ <transportConnector uri="vm://broker1"/>
+ </transportConnectors>
+
+ <networkConnectors>
+ <networkConnector uri="static:(tcp://localhost:61617)"/>
+ </networkConnectors>
+
+ </broker>
+
+</beans>
+
Propchange: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker2.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker2.xml?view=diff&rev=465739&r1=465738&r2=465739
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker2.xml (original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker2.xml Thu Oct 19 12:13:28 2006
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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
-
- 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.
--->
-<beans>
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
- <broker brokerName="broker2" persistent="false" useShutdownHook="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
-
- <!-- disabling the subscription recovery policy allows us take memory leaks easier -->
- <destinationPolicy>
- <policyMap>
- <policyEntries>
- <policyEntry topic=">">
- <subscriptionRecoveryPolicy>
- <noSubscriptionRecoveryPolicy />
- </subscriptionRecoveryPolicy>
- </policyEntry>
- </policyEntries></policyMap>
- </destinationPolicy>
-
- <transportConnectors>
- <transportConnector uri="tcp://localhost:61617"/>
- <transportConnector uri="vm://broker2"/>
- </transportConnectors>
-
- <networkConnectors>
- <networkConnector uri="static:(tcp://localhost:61616)"/>
- </networkConnectors>
-
- </broker>
-
-
-</beans>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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
+
+ 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.
+-->
+<beans>
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+ <broker brokerName="broker2" persistent="false" useShutdownHook="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+
+ <!-- disabling the subscription recovery policy allows us take memory leaks easier -->
+ <destinationPolicy>
+ <policyMap>
+ <policyEntries>
+ <policyEntry topic=">">
+ <subscriptionRecoveryPolicy>
+ <noSubscriptionRecoveryPolicy />
+ </subscriptionRecoveryPolicy>
+ </policyEntry>
+ </policyEntries></policyMap>
+ </destinationPolicy>
+
+ <transportConnectors>
+ <transportConnector uri="tcp://localhost:61617"/>
+ <transportConnector uri="vm://broker2"/>
+ </transportConnectors>
+
+ <networkConnectors>
+ <networkConnector uri="static:(tcp://localhost:61616)"/>
+ </networkConnectors>
+
+ </broker>
+
+
+</beans>
+
Propchange: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker1.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker1.xml?view=diff&rev=465739&r1=465738&r2=465739
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker1.xml (original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker1.xml Thu Oct 19 12:13:28 2006
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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
-
- 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.
--->
-<beans>
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
- <broker brokerName="broker1" persistent="false" useShutdownHook="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
-
- <!-- disabling the subscription recovery policy allows us take memory leaks easier -->
- <destinationPolicy>
- <policyMap>
- <policyEntries>
- <policyEntry topic=">">
- <subscriptionRecoveryPolicy>
- <noSubscriptionRecoveryPolicy />
- </subscriptionRecoveryPolicy>
- </policyEntry>
- </policyEntries></policyMap>
- </destinationPolicy>
-
- <transportConnectors>
- <transportConnector uri="tcp://localhost:61616"/>
- <transportConnector uri="vm://broker1"/>
- </transportConnectors>
-
- <networkConnectors>
- <networkConnector uri="static:(tcp://localhost:60007)"/>
- </networkConnectors>
-
- </broker>
-
-</beans>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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
+
+ 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.
+-->
+<beans>
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+ <broker brokerName="broker1" persistent="false" useShutdownHook="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+
+ <!-- disabling the subscription recovery policy allows us take memory leaks easier -->
+ <destinationPolicy>
+ <policyMap>
+ <policyEntries>
+ <policyEntry topic=">">
+ <subscriptionRecoveryPolicy>
+ <noSubscriptionRecoveryPolicy />
+ </subscriptionRecoveryPolicy>
+ </policyEntry>
+ </policyEntries></policyMap>
+ </destinationPolicy>
+
+ <transportConnectors>
+ <transportConnector uri="tcp://localhost:61616"/>
+ <transportConnector uri="vm://broker1"/>
+ </transportConnectors>
+
+ <networkConnectors>
+ <networkConnector uri="static:(tcp://localhost:60007)"/>
+ </networkConnectors>
+
+ </broker>
+
+</beans>
+
Propchange: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker2.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker2.xml?view=diff&rev=465739&r1=465738&r2=465739
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker2.xml (original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker2.xml Thu Oct 19 12:13:28 2006
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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
-
- 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.
--->
-<beans>
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
- <broker brokerName="broker2" persistent="false" useShutdownHook="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
-
- <!-- disabling the subscription recovery policy allows us take memory leaks easier -->
- <destinationPolicy>
- <policyMap>
- <policyEntries>
- <policyEntry topic=">">
- <subscriptionRecoveryPolicy>
- <noSubscriptionRecoveryPolicy />
- </subscriptionRecoveryPolicy>
- </policyEntry>
- </policyEntries></policyMap>
- </destinationPolicy>
-
- <transportConnectors>
- <transportConnector uri="tcp://localhost:61617"/>
- <transportConnector uri="vm://broker2"/>
- </transportConnectors>
-
- <networkConnectors>
- <networkConnector uri="static:(tcp://localhost:60006)"/>
- </networkConnectors>
-
- </broker>
-
-
-</beans>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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
+
+ 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.
+-->
+<beans>
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+ <broker brokerName="broker2" persistent="false" useShutdownHook="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+
+ <!-- disabling the subscription recovery policy allows us take memory leaks easier -->
+ <destinationPolicy>
+ <policyMap>
+ <policyEntries>
+ <policyEntry topic=">">
+ <subscriptionRecoveryPolicy>
+ <noSubscriptionRecoveryPolicy />
+ </subscriptionRecoveryPolicy>
+ </policyEntry>
+ </policyEntries></policyMap>
+ </destinationPolicy>
+
+ <transportConnectors>
+ <transportConnector uri="tcp://localhost:61617"/>
+ <transportConnector uri="vm://broker2"/>
+ </transportConnectors>
+
+ <networkConnectors>
+ <networkConnector uri="static:(tcp://localhost:60006)"/>
+ </networkConnectors>
+
+ </broker>
+
+
+</beans>
+
Propchange: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/activemq/trunk/activemq-repository-builder/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/activemq/trunk/activemq-repository-builder/src/main/assembly/repo.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/activemq-tooling/pom.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-tooling/pom.xml?view=diff&rev=465739&r1=465738&r2=465739
==============================================================================
--- incubator/activemq/trunk/activemq-tooling/pom.xml (original)
+++ incubator/activemq/trunk/activemq-tooling/pom.xml Thu Oct 19 12:13:28 2006
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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
-
- 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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-parent</artifactId>
- <version>4.1-incubator-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.activemq.tooling</groupId>
- <artifactId>activemq-tooling</artifactId>
- <packaging>pom</packaging>
- <name>ActiveMQ Tooling</name>
-
- <modules>
- <module>maven-activemq-memtest-plugin</module>
- <module>maven-activemq-perf-plugin</module>
- <module>maven-activemq-plugin</module>
- </modules>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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
+
+ 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">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-parent</artifactId>
+ <version>4.1-incubator-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.activemq.tooling</groupId>
+ <artifactId>activemq-tooling</artifactId>
+ <packaging>pom</packaging>
+ <name>ActiveMQ Tooling</name>
+
+ <modules>
+ <module>maven-activemq-memtest-plugin</module>
+ <module>maven-activemq-perf-plugin</module>
+ <module>maven-activemq-plugin</module>
+ </modules>
+
+</project>
Propchange: incubator/activemq/trunk/activemq-tooling/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/assembly/src/main/descriptors/src-bin.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/main/descriptors/src-bin.xml?view=diff&rev=465739&r1=465738&r2=465739
==============================================================================
--- incubator/activemq/trunk/assembly/src/main/descriptors/src-bin.xml (original)
+++ incubator/activemq/trunk/assembly/src/main/descriptors/src-bin.xml Thu Oct 19 12:13:28 2006
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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
-
- 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.
--->
-<assembly>
- <id>src</id>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>..</directory>
- <outputDirectory>src</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- <excludes>
- <exclude>**/target</exclude>
- <exclude>**/target/**/*</exclude>
- <exclude>**/build</exclude>
- <exclude>**/build/**/*</exclude>
- <exclude>**/data</exclude>
- <exclude>**/data/**/*</exclude>
- <exclude>**/activemq-data</exclude>
- <exclude>**/activemq-data/**/*</exclude>
- <exclude>**/.settings</exclude>
- <exclude>**/.settings/**/*</exclude>
- <exclude>**/eclipse-classes</exclude>
- <exclude>**/eclipse-classes/**/*</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.wtpmodules</exclude>
- <exclude>**/surefire*</exclude>
- <exclude>**/cobertura.ser</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/*.ipr</exclude>
- <exclude>**/*.iws</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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
+
+ 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.
+-->
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>src</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>**/target</exclude>
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/build</exclude>
+ <exclude>**/build/**/*</exclude>
+ <exclude>**/data</exclude>
+ <exclude>**/data/**/*</exclude>
+ <exclude>**/activemq-data</exclude>
+ <exclude>**/activemq-data/**/*</exclude>
+ <exclude>**/.settings</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <exclude>**/eclipse-classes</exclude>
+ <exclude>**/eclipse-classes/**/*</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.wtpmodules</exclude>
+ <exclude>**/surefire*</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: incubator/activemq/trunk/assembly/src/main/descriptors/src-bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/assembly/src/sample-conf/jdbc-example.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/sample-conf/jdbc-example.xml?view=diff&rev=465739&r1=465738&r2=465739
==============================================================================
--- incubator/activemq/trunk/assembly/src/sample-conf/jdbc-example.xml (original)
+++ incubator/activemq/trunk/assembly/src/sample-conf/jdbc-example.xml Thu Oct 19 12:13:28 2006
@@ -1,63 +1,63 @@
-<!--
- 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
-
- 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.
--->
-<!-- START SNIPPET: xbean -->
-<beans>
-
- <broker useJmx="false" brokerName="jdbcBroker" xmlns="http://activemq.org/config/1.0">
- <persistenceAdapter>
- <jdbcPersistenceAdapter dataSource="#derby-ds"/>
- </persistenceAdapter>
-
- <transportConnectors>
- <transportConnector name="default" uri="tcp://localhost:61616"/>
- </transportConnectors>
- </broker>
- <!-- This xbean configuration file supports all the standard spring xml configuration options -->
-
- <!-- Postgres DataSource Sample Setup -->
- <!--
- <bean id="postgres-ds" class="org.postgresql.ds.PGPoolingDataSource">
- <property name="serverName" value="localhost"/>
- <property name="databaseName" value="activemq"/>
- <property name="portNumber" value="0"/>
- <property name="user" value="activemq"/>
- <property name="password" value="activemq"/>
- <property name="dataSourceName" value="postgres"/>
- <property name="initialConnections" value="1"/>
- <property name="maxConnections" value="10"/>
- </bean>
- -->
-
- <!-- MySql DataSource Sample Setup -->
- <!--
- <bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
- <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
- <property name="url" value="jdbc:mysql://localhost/activemq?relaxAutoCommit=true"/>
- <property name="username" value="activemq"/>
- <property name="password" value="activemq"/>
- <property name="poolPreparedStatements" value="true"/>
- </bean>
- -->
-
- <!-- Embedded Derby DataSource Sample Setup -->
- <bean id="derby-ds" class="org.apache.derby.jdbc.EmbeddedDataSource">
- <property name="databaseName" value="derbydb"/>
- <property name="createDatabase" value="create"/>
- </bean>
-
-</beans>
-<!-- END SNIPPET: xbean -->
+<!--
+ 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
+
+ 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.
+-->
+<!-- START SNIPPET: xbean -->
+<beans>
+
+ <broker useJmx="false" brokerName="jdbcBroker" xmlns="http://activemq.org/config/1.0">
+ <persistenceAdapter>
+ <jdbcPersistenceAdapter dataSource="#derby-ds"/>
+ </persistenceAdapter>
+
+ <transportConnectors>
+ <transportConnector name="default" uri="tcp://localhost:61616"/>
+ </transportConnectors>
+ </broker>
+ <!-- This xbean configuration file supports all the standard spring xml configuration options -->
+
+ <!-- Postgres DataSource Sample Setup -->
+ <!--
+ <bean id="postgres-ds" class="org.postgresql.ds.PGPoolingDataSource">
+ <property name="serverName" value="localhost"/>
+ <property name="databaseName" value="activemq"/>
+ <property name="portNumber" value="0"/>
+ <property name="user" value="activemq"/>
+ <property name="password" value="activemq"/>
+ <property name="dataSourceName" value="postgres"/>
+ <property name="initialConnections" value="1"/>
+ <property name="maxConnections" value="10"/>
+ </bean>
+ -->
+
+ <!-- MySql DataSource Sample Setup -->
+ <!--
+ <bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
+ <property name="url" value="jdbc:mysql://localhost/activemq?relaxAutoCommit=true"/>
+ <property name="username" value="activemq"/>
+ <property name="password" value="activemq"/>
+ <property name="poolPreparedStatements" value="true"/>
+ </bean>
+ -->
+
+ <!-- Embedded Derby DataSource Sample Setup -->
+ <bean id="derby-ds" class="org.apache.derby.jdbc.EmbeddedDataSource">
+ <property name="databaseName" value="derbydb"/>
+ <property name="createDatabase" value="create"/>
+ </bean>
+
+</beans>
+<!-- END SNIPPET: xbean -->
Propchange: incubator/activemq/trunk/assembly/src/sample-conf/jdbc-example.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/assembly/src/sample-conf/journaledMem-example.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/sample-conf/journaledMem-example.xml?view=diff&rev=465739&r1=465738&r2=465739
==============================================================================
--- incubator/activemq/trunk/assembly/src/sample-conf/journaledMem-example.xml (original)
+++ incubator/activemq/trunk/assembly/src/sample-conf/journaledMem-example.xml Thu Oct 19 12:13:28 2006
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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
-
- 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.
--->
-
-<beans xmlns:amq="http://activemq.org/config/1.0">
-
- <amq:broker brokerName="journaledMemBroker" start="false" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true" advisorySupport="false">
-
- <amq:transportConnectors>
- <amq:transportConnector uri="tcp://localhost:61616"/>
- </amq:transportConnectors>
-
- <amq:persistenceAdapter>
- <amq:journalPersistenceAdapter>
- <constructor-arg index="0">
- <ref bean="myJournalImpl"/>
- </constructor-arg>
-
- <constructor-arg index="1">
- <amq:memoryPersistenceAdapter init-method="createTransactionStore"/>
- </constructor-arg>
-
- <constructor-arg index="2">
- <bean id="myTaskRunnerFactory" class="org.apache.activemq.thread.TaskRunnerFactory"/>
- </constructor-arg>
- </amq:journalPersistenceAdapter>
- </amq:persistenceAdapter>
- </amq:broker>
-
- <!-- The journal implementation that will be used -->
- <bean id="myJournalImpl" class="org.apache.activeio.journal.active.JournalImpl">
- <constructor-arg index="0">
- <bean id="myFile" class="java.io.File">
- <constructor-arg index="0">
- <value>target/journaledMem-data</value>
- </constructor-arg>
- </bean>
- </constructor-arg>
- </bean>
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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
+
+ 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.
+-->
+
+<beans xmlns:amq="http://activemq.org/config/1.0">
+
+ <amq:broker brokerName="journaledMemBroker" start="false" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true" advisorySupport="false">
+
+ <amq:transportConnectors>
+ <amq:transportConnector uri="tcp://localhost:61616"/>
+ </amq:transportConnectors>
+
+ <amq:persistenceAdapter>
+ <amq:journalPersistenceAdapter>
+ <constructor-arg index="0">
+ <ref bean="myJournalImpl"/>
+ </constructor-arg>
+
+ <constructor-arg index="1">
+ <amq:memoryPersistenceAdapter init-method="createTransactionStore"/>
+ </constructor-arg>
+
+ <constructor-arg index="2">
+ <bean id="myTaskRunnerFactory" class="org.apache.activemq.thread.TaskRunnerFactory"/>
+ </constructor-arg>
+ </amq:journalPersistenceAdapter>
+ </amq:persistenceAdapter>
+ </amq:broker>
+
+ <!-- The journal implementation that will be used -->
+ <bean id="myJournalImpl" class="org.apache.activeio.journal.active.JournalImpl">
+ <constructor-arg index="0">
+ <bean id="myFile" class="java.io.File">
+ <constructor-arg index="0">
+ <value>target/journaledMem-data</value>
+ </constructor-arg>
+ </bean>
+ </constructor-arg>
+ </bean>
+
+</beans>
Propchange: incubator/activemq/trunk/assembly/src/sample-conf/journaledMem-example.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/assembly/src/sample-conf/kaha-example.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/sample-conf/kaha-example.xml?view=diff&rev=465739&r1=465738&r2=465739
==============================================================================
--- incubator/activemq/trunk/assembly/src/sample-conf/kaha-example.xml (original)
+++ incubator/activemq/trunk/assembly/src/sample-conf/kaha-example.xml Thu Oct 19 12:13:28 2006
@@ -1,32 +1,32 @@
-<!--
- 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
-
- 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.
--->
-<!-- START SNIPPET: xbean -->
-<beans>
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
- <broker brokerName="broker" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
- <transportConnectors>
- <transportConnector uri="tcp://localhost:61616"/>
- </transportConnectors>
-
- <persistenceAdapter>
- <kahaPersistenceAdapter dir = "${activemq.home}/activemq-data"/>
- </persistenceAdapter>
- </broker>
-
-</beans>
-<!-- END SNIPPET: xbean -->
+<!--
+ 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
+
+ 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.
+-->
+<!-- START SNIPPET: xbean -->
+<beans>
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+ <broker brokerName="broker" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+ <transportConnectors>
+ <transportConnector uri="tcp://localhost:61616"/>
+ </transportConnectors>
+
+ <persistenceAdapter>
+ <kahaPersistenceAdapter dir = "${activemq.home}/activemq-data"/>
+ </persistenceAdapter>
+ </broker>
+
+</beans>
+<!-- END SNIPPET: xbean -->
Propchange: incubator/activemq/trunk/assembly/src/sample-conf/kaha-example.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/assembly/src/sample-conf/memory-example.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/sample-conf/memory-example.xml?view=diff&rev=465739&r1=465738&r2=465739
==============================================================================
--- incubator/activemq/trunk/assembly/src/sample-conf/memory-example.xml (original)
+++ incubator/activemq/trunk/assembly/src/sample-conf/memory-example.xml Thu Oct 19 12:13:28 2006
@@ -1,30 +1,30 @@
-<!--
- 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
-
- 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.
--->
-<!-- START SNIPPET: xbean -->
-<beans xmlns="http://activemq.org/config/1.0">
-
- <broker useJmx="false" brokerName="memoryBroker">
- <persistenceAdapter>
- <memoryPersistenceAdapter/>
- </persistenceAdapter>
-
- <transportConnectors>
- <transportConnector name="default" uri="vm://localhost"/>
- </transportConnectors>
- </broker>
-</beans>
-
+<!--
+ 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
+
+ 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.
+-->
+<!-- START SNIPPET: xbean -->
+<beans xmlns="http://activemq.org/config/1.0">
+
+ <broker useJmx="false" brokerName="memoryBroker">
+ <persistenceAdapter>
+ <memoryPersistenceAdapter/>
+ </persistenceAdapter>
+
+ <transportConnectors>
+ <transportConnector name="default" uri="vm://localhost"/>
+ </transportConnectors>
+ </broker>
+</beans>
+
Propchange: incubator/activemq/trunk/assembly/src/sample-conf/memory-example.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/assembly/src/sample-conf/multicastNetwork-example.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/sample-conf/multicastNetwork-example.xml?view=diff&rev=465739&r1=465738&r2=465739
==============================================================================
--- incubator/activemq/trunk/assembly/src/sample-conf/multicastNetwork-example.xml (original)
+++ incubator/activemq/trunk/assembly/src/sample-conf/multicastNetwork-example.xml Thu Oct 19 12:13:28 2006
@@ -1,35 +1,35 @@
-<!--
- 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
-
- 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.
--->
-<!-- START SNIPPET: example -->
-<beans>
-
- <broker name="b1" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
- <transportConnectors>
- <transportConnector uri="tcp://localhost:61001" discoveryUri="multicast://default"/>
- </transportConnectors>
-
- <networkConnectors>
- <networkConnector uri="multicast://default"/>
- </networkConnectors>
-
- <persistenceAdapter>
- <memoryPersistenceAdapter/>
- </persistenceAdapter>
- </broker>
-
-</beans>
-<!-- END SNIPPET: example -->
+<!--
+ 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
+
+ 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.
+-->
+<!-- START SNIPPET: example -->
+<beans>
+
+ <broker name="b1" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+ <transportConnectors>
+ <transportConnector uri="tcp://localhost:61001" discoveryUri="multicast://default"/>
+ </transportConnectors>
+
+ <networkConnectors>
+ <networkConnector uri="multicast://default"/>
+ </networkConnectors>
+
+ <persistenceAdapter>
+ <memoryPersistenceAdapter/>
+ </persistenceAdapter>
+ </broker>
+
+</beans>
+<!-- END SNIPPET: example -->
Propchange: incubator/activemq/trunk/assembly/src/sample-conf/multicastNetwork-example.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/assembly/src/sample-conf/quickJdbc-example.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/sample-conf/quickJdbc-example.xml?view=diff&rev=465739&r1=465738&r2=465739
==============================================================================
--- incubator/activemq/trunk/assembly/src/sample-conf/quickJdbc-example.xml (original)
+++ incubator/activemq/trunk/assembly/src/sample-conf/quickJdbc-example.xml Thu Oct 19 12:13:28 2006
@@ -1,70 +1,70 @@
-<!--
- 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
-
- 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.
--->
-<!-- START SNIPPET: xbean -->
-<beans>
-
- <broker useJmx="false" brokerName="quickJdbcBroker" xmlns="http://activemq.org/config/1.0">
- <persistenceAdapter>
- <journaledJDBC journalLogFiles="4"
- journalLogFileSize="32768"
- useJournal="true"
- useQuickJournal="true"
- dataSource="#derby-ds"
- dataDirectory="target/quickJdbc-data"/>
-
- </persistenceAdapter>
-
- <transportConnectors>
- <transportConnector name="default" uri="tcp://localhost:61616"/>
- </transportConnectors>
- </broker>
-
- <!-- This xbean configuration file supports all the standard spring xml configuration options -->
-
- <!-- Postgres DataSource Sample Setup -->
- <!--
- <bean id="postgres-ds" class="org.postgresql.ds.PGPoolingDataSource">
- <property name="serverName" value="localhost"/>
- <property name="databaseName" value="activemq"/>
- <property name="portNumber" value="0"/>
- <property name="user" value="activemq"/>
- <property name="password" value="activemq"/>
- <property name="dataSourceName" value="postgres"/>
- <property name="initialConnections" value="1"/>
- <property name="maxConnections" value="10"/>
- </bean>
- -->
-
- <!-- MySql DataSource Sample Setup -->
- <!--
- <bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
- <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
- <property name="url" value="jdbc:mysql://localhost/activemq?relaxAutoCommit=true"/>
- <property name="username" value="activemq"/>
- <property name="password" value="activemq"/>
- <property name="poolPreparedStatements" value="true"/>
- </bean>
- -->
-
- <!-- Embedded Derby DataSource Sample Setup -->
- <bean id="derby-ds" class="org.apache.derby.jdbc.EmbeddedDataSource">
- <property name="databaseName" value="derbydb"/>
- <property name="createDatabase" value="create"/>
- </bean>
-
-</beans>
-<!-- END SNIPPET: xbean -->
+<!--
+ 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
+
+ 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.
+-->
+<!-- START SNIPPET: xbean -->
+<beans>
+
+ <broker useJmx="false" brokerName="quickJdbcBroker" xmlns="http://activemq.org/config/1.0">
+ <persistenceAdapter>
+ <journaledJDBC journalLogFiles="4"
+ journalLogFileSize="32768"
+ useJournal="true"
+ useQuickJournal="true"
+ dataSource="#derby-ds"
+ dataDirectory="target/quickJdbc-data"/>
+
+ </persistenceAdapter>
+
+ <transportConnectors>
+ <transportConnector name="default" uri="tcp://localhost:61616"/>
+ </transportConnectors>
+ </broker>
+
+ <!-- This xbean configuration file supports all the standard spring xml configuration options -->
+
+ <!-- Postgres DataSource Sample Setup -->
+ <!--
+ <bean id="postgres-ds" class="org.postgresql.ds.PGPoolingDataSource">
+ <property name="serverName" value="localhost"/>
+ <property name="databaseName" value="activemq"/>
+ <property name="portNumber" value="0"/>
+ <property name="user" value="activemq"/>
+ <property name="password" value="activemq"/>
+ <property name="dataSourceName" value="postgres"/>
+ <property name="initialConnections" value="1"/>
+ <property name="maxConnections" value="10"/>
+ </bean>
+ -->
+
+ <!-- MySql DataSource Sample Setup -->
+ <!--
+ <bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
+ <property name="url" value="jdbc:mysql://localhost/activemq?relaxAutoCommit=true"/>
+ <property name="username" value="activemq"/>
+ <property name="password" value="activemq"/>
+ <property name="poolPreparedStatements" value="true"/>
+ </bean>
+ -->
+
+ <!-- Embedded Derby DataSource Sample Setup -->
+ <bean id="derby-ds" class="org.apache.derby.jdbc.EmbeddedDataSource">
+ <property name="databaseName" value="derbydb"/>
+ <property name="createDatabase" value="create"/>
+ </bean>
+
+</beans>
+<!-- END SNIPPET: xbean -->
Propchange: incubator/activemq/trunk/assembly/src/sample-conf/quickJdbc-example.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/assembly/src/sample-conf/quickMem-example.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/sample-conf/quickMem-example.xml?view=diff&rev=465739&r1=465738&r2=465739
==============================================================================
--- incubator/activemq/trunk/assembly/src/sample-conf/quickMem-example.xml (original)
+++ incubator/activemq/trunk/assembly/src/sample-conf/quickMem-example.xml Thu Oct 19 12:13:28 2006
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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
-
- 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.
--->
-
-<beans xmlns:amq="http://activemq.org/config/1.0">
-
- <amq:broker brokerName="quickMemBroker" start="false" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true" advisorySupport="false">
-
- <amq:transportConnectors>
- <amq:transportConnector uri="tcp://localhost:61616"/>
- </amq:transportConnectors>
-
- <amq:persistenceAdapter>
- <amq:quickJournalPersistenceAdapter>
- <constructor-arg index="0">
- <ref bean="myJournalImpl"/>
- </constructor-arg>
-
- <constructor-arg index="1">
- <amq:memoryPersistenceAdapter init-method="createTransactionStore"/>
- </constructor-arg>
-
- <constructor-arg index="2">
- <bean id="myTaskRunnerFactory" class="org.apache.activemq.thread.TaskRunnerFactory"/>
- </constructor-arg>
- </amq:quickJournalPersistenceAdapter>
- </amq:persistenceAdapter>
- </amq:broker>
-
- <!-- The journal implementation that will be used -->
- <bean id="myJournalImpl" class="org.apache.activeio.journal.active.JournalImpl">
- <constructor-arg index="0">
- <bean id="myFile" class="java.io.File">
- <constructor-arg index="0">
- <value>target/quickMem-data</value>
- </constructor-arg>
- </bean>
- </constructor-arg>
- </bean>
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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
+
+ 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.
+-->
+
+<beans xmlns:amq="http://activemq.org/config/1.0">
+
+ <amq:broker brokerName="quickMemBroker" start="false" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true" advisorySupport="false">
+
+ <amq:transportConnectors>
+ <amq:transportConnector uri="tcp://localhost:61616"/>
+ </amq:transportConnectors>
+
+ <amq:persistenceAdapter>
+ <amq:quickJournalPersistenceAdapter>
+ <constructor-arg index="0">
+ <ref bean="myJournalImpl"/>
+ </constructor-arg>
+
+ <constructor-arg index="1">
+ <amq:memoryPersistenceAdapter init-method="createTransactionStore"/>
+ </constructor-arg>
+
+ <constructor-arg index="2">
+ <bean id="myTaskRunnerFactory" class="org.apache.activemq.thread.TaskRunnerFactory"/>
+ </constructor-arg>
+ </amq:quickJournalPersistenceAdapter>
+ </amq:persistenceAdapter>
+ </amq:broker>
+
+ <!-- The journal implementation that will be used -->
+ <bean id="myJournalImpl" class="org.apache.activeio.journal.active.JournalImpl">
+ <constructor-arg index="0">
+ <bean id="myFile" class="java.io.File">
+ <constructor-arg index="0">
+ <value>target/quickMem-data</value>
+ </constructor-arg>
+ </bean>
+ </constructor-arg>
+ </bean>
+
+</beans>
Propchange: incubator/activemq/trunk/assembly/src/sample-conf/quickMem-example.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/assembly/src/sample-conf/rapid-example.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/sample-conf/rapid-example.xml?view=diff&rev=465739&r1=465738&r2=465739
==============================================================================
--- incubator/activemq/trunk/assembly/src/sample-conf/rapid-example.xml (original)
+++ incubator/activemq/trunk/assembly/src/sample-conf/rapid-example.xml Thu Oct 19 12:13:28 2006
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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
-
- 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.
--->
-
-<beans xmlns:amq="http://activemq.org/config/1.0">
-
- <amq:broker brokerName="rapidBroker" start="false" persistent="true" useShutdownHook="false" deleteAllMessagesOnStartup="true" advisorySupport="false">
-
- <amq:transportConnectors>
- <amq:transportConnector uri="tcp://localhost:61616"/>
- </amq:transportConnectors>
-
- <amq:persistenceAdapter>
- <amq:rapidPersistenceAdapter>
- <constructor-arg index="0">
- <ref bean="myJournalImpl"/>
- </constructor-arg>
-
- <constructor-arg index="1">
- <bean id="myTaskRunnerFactory" class="org.apache.activemq.thread.TaskRunnerFactory"/>
- </constructor-arg>
- </amq:rapidPersistenceAdapter>
- </amq:persistenceAdapter>
- </amq:broker>
-
- <!-- The journal implementation that will be used -->
- <bean id="myJournalImpl" class="org.apache.activeio.journal.active.JournalImpl">
- <constructor-arg index="0">
- <bean id="myFile" class="java.io.File">
- <constructor-arg index="0">
- <value>target/rapid-data</value>
- </constructor-arg>
- </bean>
- </constructor-arg>
- </bean>
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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
+
+ 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.
+-->
+
+<beans xmlns:amq="http://activemq.org/config/1.0">
+
+ <amq:broker brokerName="rapidBroker" start="false" persistent="true" useShutdownHook="false" deleteAllMessagesOnStartup="true" advisorySupport="false">
+
+ <amq:transportConnectors>
+ <amq:transportConnector uri="tcp://localhost:61616"/>
+ </amq:transportConnectors>
+
+ <amq:persistenceAdapter>
+ <amq:rapidPersistenceAdapter>
+ <constructor-arg index="0">
+ <ref bean="myJournalImpl"/>
+ </constructor-arg>
+
+ <constructor-arg index="1">
+ <bean id="myTaskRunnerFactory" class="org.apache.activemq.thread.TaskRunnerFactory"/>
+ </constructor-arg>
+ </amq:rapidPersistenceAdapter>
+ </amq:persistenceAdapter>
+ </amq:broker>
+
+ <!-- The journal implementation that will be used -->
+ <bean id="myJournalImpl" class="org.apache.activeio.journal.active.JournalImpl">
+ <constructor-arg index="0">
+ <bean id="myFile" class="java.io.File">
+ <constructor-arg index="0">
+ <value>target/rapid-data</value>
+ </constructor-arg>
+ </bean>
+ </constructor-arg>
+ </bean>
+
+</beans>
Propchange: incubator/activemq/trunk/assembly/src/sample-conf/rapid-example.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/activemq/trunk/assembly/src/sample-conf/staticNetwork-example.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/sample-conf/staticNetwork-example.xml?view=diff&rev=465739&r1=465738&r2=465739
==============================================================================
--- incubator/activemq/trunk/assembly/src/sample-conf/staticNetwork-example.xml (original)
+++ incubator/activemq/trunk/assembly/src/sample-conf/staticNetwork-example.xml Thu Oct 19 12:13:28 2006
@@ -1,36 +1,36 @@
-<!--
- 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
-
- 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.
--->
-<!-- START SNIPPET: example -->
-<beans>
-
- <broker brokerName="broker" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
- <transportConnectors>
- <transportConnector uri="tcp://localhost:62001"/>
- </transportConnectors>
-
- <networkConnectors>
- <!-- This broker will connect to the brokers specified in networkConnector uri -->
- <networkConnector uri="static:(tcp://localhost:62002,tcp://localhost:62003)" failover="true"/>
- </networkConnectors>
-
- <persistenceAdapter>
- <memoryPersistenceAdapter/>
- </persistenceAdapter>
- </broker>
-
-</beans>
-<!-- END SNIPPET: example -->
+<!--
+ 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
+
+ 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.
+-->
+<!-- START SNIPPET: example -->
+<beans>
+
+ <broker brokerName="broker" persistent="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+ <transportConnectors>
+ <transportConnector uri="tcp://localhost:62001"/>
+ </transportConnectors>
+
+ <networkConnectors>
+ <!-- This broker will connect to the brokers specified in networkConnector uri -->
+ <networkConnector uri="static:(tcp://localhost:62002,tcp://localhost:62003)" failover="true"/>
+ </networkConnectors>
+
+ <persistenceAdapter>
+ <memoryPersistenceAdapter/>
+ </persistenceAdapter>
+ </broker>
+
+</beans>
+<!-- END SNIPPET: example -->
Propchange: incubator/activemq/trunk/assembly/src/sample-conf/staticNetwork-example.xml
------------------------------------------------------------------------------
svn:eol-style = native