activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r426384 [4/5] - in /incubator/activemq/trunk: activecluster/src/test/org/apache/activecluster/ activeio/activeio-core/src/main/java/org/apache/activeio/journal/active/ activeio/activeio-oneport-openorb/src/test/java/org/apache/activeio/onep...
Date Fri, 28 Jul 2006 05:00:33 GMT
Modified: incubator/activemq/trunk/activemq-jmeter/resource/jmeterw.bat
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-jmeter/resource/jmeterw.bat?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-jmeter/resource/jmeterw.bat (original)
+++ incubator/activemq/trunk/activemq-jmeter/resource/jmeterw.bat Thu Jul 27 22:00:24 2006
@@ -1,23 +1,25 @@
 @echo off
 rem   Run JMeter using javaw
 
-rem   $Id: jmeterw.bat,v 1.4 2005/03/18 15:26:54 mstover1 Exp $
-rem   Copyright 2001-2004 The Apache Software Foundation
-rem 
-rem   Licensed under the Apache License, Version 2.0 (the "License");
-rem   you may not use this file except in compliance with the License.
-rem   You may obtain a copy of the License at
-rem 
-rem       http://www.apache.org/licenses/LICENSE-2.0
-rem 
-rem   Unless required by applicable law or agreed to in writing, software
-rem   distributed under the License is distributed on an "AS IS" BASIS,
-rem   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem   See the License for the specific language governing permissions and
-rem   limitations under the License.
+REM ------------------------------------------------------------------------
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements.  See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM the License.  You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+REM ------------------------------------------------------------------------
 
 set JM_START=start
 set JM_LAUNCH=javaw.exe
 call jmeter %*
 set JM_START=
-set JM_LAUNCH=
\ No newline at end of file
+set JM_LAUNCH=

Modified: incubator/activemq/trunk/activemq-jmeter/resource/log4j.conf
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-jmeter/resource/log4j.conf?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-jmeter/resource/log4j.conf (original)
+++ incubator/activemq/trunk/activemq-jmeter/resource/log4j.conf Thu Jul 27 22:00:24 2006
@@ -1,18 +1,19 @@
-
-##   $Id: log4j.conf,v 1.5 2004/02/16 13:34:10 sebb Exp $
-##   Copyright 2001-2004 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.
+# ------------------------------------------------------------------------
+# 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.
+# ------------------------------------------------------------------------
 
 # Set appender specific options
 
@@ -35,4 +36,4 @@
 
 # Set the appenders for the categories
 log4j.rootCategory=INFO,Root_Appender
-#log4j.configDebug
\ No newline at end of file
+#log4j.configDebug

Modified: incubator/activemq/trunk/activemq-jmeter/resource/upgrade.properties
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-jmeter/resource/upgrade.properties?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-jmeter/resource/upgrade.properties (original)
+++ incubator/activemq/trunk/activemq-jmeter/resource/upgrade.properties Thu Jul 27 22:00:24 2006
@@ -1,19 +1,21 @@
 # Class, property and value upgrade equivalences.
 
-##   $Id: upgrade.properties,v 1.6 2004/05/19 20:15:42 mstover1 Exp $
-##   Copyright 2001-2004 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.
+# ------------------------------------------------------------------------
+# 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.
+# ------------------------------------------------------------------------
 
 #
 # Format is as follows --
@@ -35,4 +37,4 @@
 
 org.apache.jmeter.protocol.jdbc.control.gui.JdbcTestSampleGui=org.apache.jmeter.testbeans.gui.TestBeanGUI
 org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler/JDBCSampler.query=query
-org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler.JDBCSampler.dataSource/NULL=
\ No newline at end of file
+org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler.JDBCSampler.dataSource/NULL=

Modified: incubator/activemq/trunk/activemq-jmeter/resource/users.dtd
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-jmeter/resource/users.dtd?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-jmeter/resource/users.dtd (original)
+++ incubator/activemq/trunk/activemq-jmeter/resource/users.dtd Thu Jul 27 22:00:24 2006
@@ -1,23 +1,23 @@
 <!-- USERS DTD -->
 <!--
-   $Header: /home/cvspublic/jakarta-jmeter/bin/users.dtd,v 1.2 2004/07/03 14:32:23 sebb Exp $
-   Copyright 1999-2004 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.
+    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.
 -->
 
 <!ELEMENT allthreads (thread+)>
 <!ELEMENT thread (parameter+)>
 <!ELEMENT parameter (paramname,paramvalue) >
 <!ELEMENT paramname   (#PCDATA)   >
-<!ELEMENT paramvalue  (#PCDATA)  >
\ No newline at end of file
+<!ELEMENT paramvalue  (#PCDATA)  >

Modified: incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/TestDataGenerator.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/TestDataGenerator.java?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/TestDataGenerator.java (original)
+++ incubator/activemq/trunk/activemq-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/TestDataGenerator.java Thu Jul 27 22:00:24 2006
@@ -1,20 +1,20 @@
 /**
- * 
- * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com
- * 
- * 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
- * 
+ *
  * 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. 
- * 
- **/
+ * 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.openwire.tool;
 
 /**

Modified: incubator/activemq/trunk/activemq-openwire-generator/src/main/resources/GenerateCppClasses.groovy
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-openwire-generator/src/main/resources/GenerateCppClasses.groovy?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-openwire-generator/src/main/resources/GenerateCppClasses.groovy (original)
+++ incubator/activemq/trunk/activemq-openwire-generator/src/main/resources/GenerateCppClasses.groovy Thu Jul 27 22:00:24 2006
@@ -1,10 +1,11 @@
 /**
  *
- * 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
  *
@@ -25,21 +26,22 @@
 
 	void generateFile(PrintWriter out) {
                 out << """/*
-* 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.
-*/
+ *
+ * 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.
+ */
 #include "activemq/command/${className}.hpp"
 
 using namespace apache::activemq::command;

Modified: incubator/activemq/trunk/activemq-openwire-generator/src/main/resources/GenerateCppHeaders.groovy
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-openwire-generator/src/main/resources/GenerateCppHeaders.groovy?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-openwire-generator/src/main/resources/GenerateCppHeaders.groovy (original)
+++ incubator/activemq/trunk/activemq-openwire-generator/src/main/resources/GenerateCppHeaders.groovy Thu Jul 27 22:00:24 2006
@@ -1,153 +1,155 @@
-/**
- *
- * 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.
- */
-import org.apache.activemq.openwire.tool.OpenWireCppHeadersScript
-
-/**
- * Generates the C++ commands for the Open Wire Format
- *
- * @version $Revision$
- */
-class GenerateCppHeaders extends OpenWireCppHeadersScript {
-
-	void generateFile(PrintWriter out) {
-                out << """/*
-* 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 ActiveMQ_${className}_hpp_
-#define ActiveMQ_${className}_hpp_
-
-// Turn off warning message for ignored exception specification
-#ifdef _MSC_VER
-#pragma warning( disable : 4290 )
-#endif
-
-#include <string>
-"""
-    out << """#include "activemq/command/${baseClass}.hpp"
-"""
-for (property in properties)
-{
-    if( !property.type.isPrimitiveType() &&
-         property.type.simpleName != "String" &&
-         property.type.simpleName != "ByteSequence" )
-    {
-        def includeName = toCppType(property.type)
-        if( property.type.isArrayType() )
-        {
-            def arrayType = property.type.arrayComponentType ;
-            if( arrayType.isPrimitiveType() )
-                continue ;
-        }
-        if( includeName.startsWith("array<") )
-            includeName = includeName.substring(6, includeName.length()-1) ;
-        else if( includeName.startsWith("p<") )
-            includeName = includeName.substring(2, includeName.length()-1)
-
-        if( includeName.equals("IDataStructure") )
-            out << """#include "activemq/${includeName}.hpp"
-"""
-        else
-            out << """#include "activemq/command/${includeName}.hpp"
-"""
-    }
-}
-out << """
-#include "activemq/protocol/IMarshaller.hpp"
-#include "ppr/io/IOutputStream.hpp"
-#include "ppr/io/IInputStream.hpp"
-#include "ppr/io/IOException.hpp"
-#include "ppr/util/ifr/array"
-#include "ppr/util/ifr/p"
-
-namespace apache
-{
-  namespace activemq
-  {
-    namespace command
-    {
-      using namespace ifr;
-      using namespace std;
+/**
+ *
+ * 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.
+ */
+import org.apache.activemq.openwire.tool.OpenWireCppHeadersScript
+
+/**
+ * Generates the C++ commands for the Open Wire Format
+ *
+ * @version $Revision$
+ */
+class GenerateCppHeaders extends OpenWireCppHeadersScript {
+
+	void generateFile(PrintWriter out) {
+                out << """/*
+ *
+ * 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.
+ */
+#ifndef ActiveMQ_${className}_hpp_
+#define ActiveMQ_${className}_hpp_
+
+// Turn off warning message for ignored exception specification
+#ifdef _MSC_VER
+#pragma warning( disable : 4290 )
+#endif
+
+#include <string>
+"""
+    out << """#include "activemq/command/${baseClass}.hpp"
+"""
+for (property in properties)
+{
+    if( !property.type.isPrimitiveType() &&
+         property.type.simpleName != "String" &&
+         property.type.simpleName != "ByteSequence" )
+    {
+        def includeName = toCppType(property.type)
+        if( property.type.isArrayType() )
+        {
+            def arrayType = property.type.arrayComponentType ;
+            if( arrayType.isPrimitiveType() )
+                continue ;
+        }
+        if( includeName.startsWith("array<") )
+            includeName = includeName.substring(6, includeName.length()-1) ;
+        else if( includeName.startsWith("p<") )
+            includeName = includeName.substring(2, includeName.length()-1)
+
+        if( includeName.equals("IDataStructure") )
+            out << """#include "activemq/${includeName}.hpp"
+"""
+        else
+            out << """#include "activemq/command/${includeName}.hpp"
+"""
+    }
+}
+out << """
+#include "activemq/protocol/IMarshaller.hpp"
+#include "ppr/io/IOutputStream.hpp"
+#include "ppr/io/IInputStream.hpp"
+#include "ppr/io/IOException.hpp"
+#include "ppr/util/ifr/array"
+#include "ppr/util/ifr/p"
+
+namespace apache
+{
+  namespace activemq
+  {
+    namespace command
+    {
+      using namespace ifr;
+      using namespace std;
       using namespace apache::activemq;
       using namespace apache::activemq::protocol;
       using namespace apache::ppr::io;
-
-/*
- *
- *  Command and marshalling code for OpenWire format for ${className}
- *
- *
- *  NOTE!: This file is autogenerated - do not modify!
- *         if you need to make a change, please see the Groovy scripts in the
- *         activemq-core module
- *
- */
-class ${className} : public ${baseClass}
-{
-protected:
-"""
-    for (property in properties) {
-        def type = toCppType(property.type)
-        def name = decapitalize(property.simpleName)
-        out << """    $type $name ;
-"""
-    }
-    out << """
-public:
-    const static unsigned char TYPE = ${getOpenWireOpCode(jclass)};
-
-public:
-    ${className}() ;
-    virtual ~${className}() ;
-
-    virtual unsigned char getDataStructureType() ;
-"""
-    for (property in properties) {
-        def type = toCppType(property.type)
-        def propertyName = property.simpleName
-        def parameterName = decapitalize(propertyName)
-        out << """
-    virtual ${type} get${propertyName}() ;
-    virtual void set${propertyName}(${type} ${parameterName}) ;
-"""
-    }
-    out << """
-    virtual int marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> ostream) throw (IOException) ;
-    virtual void unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> istream) throw (IOException) ;
-} ;
-
-/* namespace */
-    }
-  }
-}
-
-#endif /*ActiveMQ_${className}_hpp_*/
-"""
-    }
-}
+
+/*
+ *
+ *  Command and marshalling code for OpenWire format for ${className}
+ *
+ *
+ *  NOTE!: This file is autogenerated - do not modify!
+ *         if you need to make a change, please see the Groovy scripts in the
+ *         activemq-core module
+ *
+ */
+class ${className} : public ${baseClass}
+{
+protected:
+"""
+    for (property in properties) {
+        def type = toCppType(property.type)
+        def name = decapitalize(property.simpleName)
+        out << """    $type $name ;
+"""
+    }
+    out << """
+public:
+    const static unsigned char TYPE = ${getOpenWireOpCode(jclass)};
+
+public:
+    ${className}() ;
+    virtual ~${className}() ;
+
+    virtual unsigned char getDataStructureType() ;
+"""
+    for (property in properties) {
+        def type = toCppType(property.type)
+        def propertyName = property.simpleName
+        def parameterName = decapitalize(propertyName)
+        out << """
+    virtual ${type} get${propertyName}() ;
+    virtual void set${propertyName}(${type} ${parameterName}) ;
+"""
+    }
+    out << """
+    virtual int marshal(p<IMarshaller> marshaller, int mode, p<IOutputStream> ostream) throw (IOException) ;
+    virtual void unmarshal(p<IMarshaller> marshaller, int mode, p<IInputStream> istream) throw (IOException) ;
+} ;
+
+/* namespace */
+    }
+  }
+}
+
+#endif /*ActiveMQ_${className}_hpp_*/
+"""
+    }
+}

Modified: incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpSpringEmbeddedTunnelServlet.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpSpringEmbeddedTunnelServlet.java?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpSpringEmbeddedTunnelServlet.java (original)
+++ incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpSpringEmbeddedTunnelServlet.java Thu Jul 27 22:00:24 2006
@@ -1,20 +1,20 @@
 /**
- * 
- * Copyright 2004 Protique Ltd
- * 
- * 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
- * 
+ *
  * 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. 
- * 
- **/
+ * 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.transport.http;
 
 import org.apache.activemq.broker.BrokerService;

Modified: incubator/activemq/trunk/activemq-rar/src/main/rar/META-INF/ra.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-rar/src/main/rar/META-INF/ra.xml?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-rar/src/main/rar/META-INF/ra.xml (original)
+++ incubator/activemq/trunk/activemq-rar/src/main/rar/META-INF/ra.xml Thu Jul 27 22:00:24 2006
@@ -28,21 +28,208 @@
     <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>

Modified: incubator/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ incubator/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml Thu Jul 27 22:00:24 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
    

Modified: incubator/activemq/trunk/assembly/src/release/bin/activemq
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/bin/activemq?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/bin/activemq (original)
+++ incubator/activemq/trunk/assembly/src/release/bin/activemq Thu Jul 27 22:00:24 2006
@@ -1,24 +1,21 @@
 #!/bin/sh
 
-#   ActiveMQ shell script
-#
-#   $Id: activemq,v 1.1.1.1 2005/03/11 21:14:04 jstrachan Exp $
-#
-#   This script is heavily based on the Ant script
-#
-#   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.
+# ------------------------------------------------------------------------
+# 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.
+# ------------------------------------------------------------------------
 
 # load system-wide activemq configuration
 if [ -f "/etc/activemq.conf" ] ; then

Modified: incubator/activemq/trunk/assembly/src/release/bin/activemq.bat
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/bin/activemq.bat?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/bin/activemq.bat (original)
+++ incubator/activemq/trunk/assembly/src/release/bin/activemq.bat Thu Jul 27 22:00:24 2006
@@ -1,24 +1,21 @@
 @echo off
 
-REM   ActiveMQ shell script
-REM
-REM   $Id: activemq.bat,v 1.1.1.1 2005/03/11 21:14:04 jstrachan Exp $
-REM
-REM   This script is heavily based on the Ant script
-REM
-REM   Copyright 2005-2006 The Apache Software Foundation
-REM
-REM   Licensed under the Apache License, Version 2.0 (the "License");
-REM   you may not use this file except in compliance with the License.
-REM   You may obtain a copy of the License at
-REM
-REM   http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM   Unless required by applicable law or agreed to in writing, software
-REM   distributed under the License is distributed on an "AS IS" BASIS,
-REM   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM   See the License for the specific language governing permissions and
-REM   limitations under the License.
+REM ------------------------------------------------------------------------
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements.  See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM the License.  You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+REM ------------------------------------------------------------------------
 
 if exist "%HOME%\activemqrc_pre.bat" call "%HOME%\activemqrc_pre.bat"
 

Modified: incubator/activemq/trunk/assembly/src/release/bin/browse
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/bin/browse?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/bin/browse (original)
+++ incubator/activemq/trunk/assembly/src/release/bin/browse Thu Jul 27 22:00:24 2006
@@ -1,22 +1,21 @@
 #!/bin/sh
 
-#   ActiveMQ shell script
-#
-#   This script is heavily based on the Ant script
-#
-#   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.
+# ------------------------------------------------------------------------
+# 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.
+# ------------------------------------------------------------------------
 
 # load system-wide activemq configuration
 if [ -f "/etc/activemq.conf" ] ; then

Modified: incubator/activemq/trunk/assembly/src/release/bin/browse.bat
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/bin/browse.bat?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/bin/browse.bat (original)
+++ incubator/activemq/trunk/assembly/src/release/bin/browse.bat Thu Jul 27 22:00:24 2006
@@ -1,22 +1,21 @@
 @echo off
 
-REM   ActiveMQ shell script
+REM ------------------------------------------------------------------------
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements.  See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM the License.  You may obtain a copy of the License at
 REM
-REM   This script is heavily based on the Ant script
+REM http://www.apache.org/licenses/LICENSE-2.0
 REM
-REM   Copyright 2005-2006 The Apache Software Foundation
-REM
-REM   Licensed under the Apache License, Version 2.0 (the "License");
-REM   you may not use this file except in compliance with the License.
-REM   You may obtain a copy of the License at
-REM
-REM   http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM   Unless required by applicable law or agreed to in writing, software
-REM   distributed under the License is distributed on an "AS IS" BASIS,
-REM   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM   See the License for the specific language governing permissions and
-REM   limitations under the License.
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+REM ------------------------------------------------------------------------
 
 if exist "%HOME%\activemqrc_pre.bat" call "%HOME%\activemqrc_pre.bat"
 

Modified: incubator/activemq/trunk/assembly/src/release/bin/bstat
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/bin/bstat?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/bin/bstat (original)
+++ incubator/activemq/trunk/assembly/src/release/bin/bstat Thu Jul 27 22:00:24 2006
@@ -1,22 +1,21 @@
 #!/bin/sh
 
-#   ActiveMQ shell script
-#
-#   This script is heavily based on the Ant script
-#
-#   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.
+# ------------------------------------------------------------------------
+# 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.
+# ------------------------------------------------------------------------
 
 # load system-wide activemq configuration
 if [ -f "/etc/activemq.conf" ] ; then

Modified: incubator/activemq/trunk/assembly/src/release/bin/bstat.bat
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/bin/bstat.bat?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/bin/bstat.bat (original)
+++ incubator/activemq/trunk/assembly/src/release/bin/bstat.bat Thu Jul 27 22:00:24 2006
@@ -1,22 +1,21 @@
 @echo off
 
-REM   ActiveMQ shell script
+REM ------------------------------------------------------------------------
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements.  See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM the License.  You may obtain a copy of the License at
 REM
-REM   This script is heavily based on the Ant script
+REM http://www.apache.org/licenses/LICENSE-2.0
 REM
-REM   Copyright 2005-2006 The Apache Software Foundation
-REM
-REM   Licensed under the Apache License, Version 2.0 (the "License");
-REM   you may not use this file except in compliance with the License.
-REM   You may obtain a copy of the License at
-REM
-REM   http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM   Unless required by applicable law or agreed to in writing, software
-REM   distributed under the License is distributed on an "AS IS" BASIS,
-REM   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM   See the License for the specific language governing permissions and
-REM   limitations under the License.
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+REM ------------------------------------------------------------------------
 
 if exist "%HOME%\activemqrc_pre.bat" call "%HOME%\activemqrc_pre.bat"
 

Modified: incubator/activemq/trunk/assembly/src/release/bin/lcp.bat
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/bin/lcp.bat?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/bin/lcp.bat (original)
+++ incubator/activemq/trunk/assembly/src/release/bin/lcp.bat Thu Jul 27 22:00:24 2006
@@ -1,16 +1,19 @@
-REM   Copyright 2005-2006 The Apache Software Foundation
+REM ------------------------------------------------------------------------
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements.  See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM the License.  You may obtain a copy of the License at
 REM
-REM   Licensed under the Apache License, Version 2.0 (the "License");
-REM   you may not use this file except in compliance with the License.
-REM   You may obtain a copy of the License at
+REM http://www.apache.org/licenses/LICENSE-2.0
 REM
-REM   http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM   Unless required by applicable law or agreed to in writing, software
-REM   distributed under the License is distributed on an "AS IS" BASIS,
-REM   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM   See the License for the specific language governing permissions and
-REM   limitations under the License.
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+REM ------------------------------------------------------------------------
 
 set _CLASSPATHCOMPONENT=%1
 if ""%1""=="""" goto gotAllArgs

Modified: incubator/activemq/trunk/assembly/src/release/bin/list
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/bin/list?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/bin/list (original)
+++ incubator/activemq/trunk/assembly/src/release/bin/list Thu Jul 27 22:00:24 2006
@@ -1,22 +1,21 @@
 #!/bin/sh
 
-#   ActiveMQ shell script
-#
-#   This script is heavily based on the Ant script
-#
-#   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.
+# ------------------------------------------------------------------------
+# 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.
+# ------------------------------------------------------------------------
 
 # load system-wide activemq configuration
 if [ -f "/etc/activemq.conf" ] ; then

Modified: incubator/activemq/trunk/assembly/src/release/bin/list.bat
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/bin/list.bat?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/bin/list.bat (original)
+++ incubator/activemq/trunk/assembly/src/release/bin/list.bat Thu Jul 27 22:00:24 2006
@@ -1,22 +1,21 @@
 @echo off
 
-REM   ActiveMQ shell script
+REM ------------------------------------------------------------------------
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements.  See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM the License.  You may obtain a copy of the License at
 REM
-REM   This script is heavily based on the Ant script
+REM http://www.apache.org/licenses/LICENSE-2.0
 REM
-REM   Copyright 2005-2006 The Apache Software Foundation
-REM
-REM   Licensed under the Apache License, Version 2.0 (the "License");
-REM   you may not use this file except in compliance with the License.
-REM   You may obtain a copy of the License at
-REM
-REM   http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM   Unless required by applicable law or agreed to in writing, software
-REM   distributed under the License is distributed on an "AS IS" BASIS,
-REM   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM   See the License for the specific language governing permissions and
-REM   limitations under the License.
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+REM ------------------------------------------------------------------------
 
 if exist "%HOME%\activemqrc_pre.bat" call "%HOME%\activemqrc_pre.bat"
 

Modified: incubator/activemq/trunk/assembly/src/release/bin/query
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/bin/query?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/bin/query (original)
+++ incubator/activemq/trunk/assembly/src/release/bin/query Thu Jul 27 22:00:24 2006
@@ -1,22 +1,21 @@
 #!/bin/sh
 
-#   ActiveMQ shell script
-#
-#   This script is heavily based on the Ant script
-#
-#   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.
+# ------------------------------------------------------------------------
+# 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.
+# ------------------------------------------------------------------------
 
 # load system-wide activemq configuration
 if [ -f "/etc/activemq.conf" ] ; then

Modified: incubator/activemq/trunk/assembly/src/release/bin/query.bat
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/bin/query.bat?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/bin/query.bat (original)
+++ incubator/activemq/trunk/assembly/src/release/bin/query.bat Thu Jul 27 22:00:24 2006
@@ -1,22 +1,21 @@
 @echo off
 
-REM   ActiveMQ shell script
+REM ------------------------------------------------------------------------
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements.  See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM the License.  You may obtain a copy of the License at
 REM
-REM   This script is heavily based on the Ant script
+REM http://www.apache.org/licenses/LICENSE-2.0
 REM
-REM   Copyright 2005-2006 The Apache Software Foundation
-REM
-REM   Licensed under the Apache License, Version 2.0 (the "License");
-REM   you may not use this file except in compliance with the License.
-REM   You may obtain a copy of the License at
-REM
-REM   http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM   Unless required by applicable law or agreed to in writing, software
-REM   distributed under the License is distributed on an "AS IS" BASIS,
-REM   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM   See the License for the specific language governing permissions and
-REM   limitations under the License.
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+REM ------------------------------------------------------------------------
 
 if exist "%HOME%\activemqrc_pre.bat" call "%HOME%\activemqrc_pre.bat"
 

Modified: incubator/activemq/trunk/assembly/src/release/bin/shutdown
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/bin/shutdown?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/bin/shutdown (original)
+++ incubator/activemq/trunk/assembly/src/release/bin/shutdown Thu Jul 27 22:00:24 2006
@@ -1,22 +1,21 @@
 #!/bin/sh
 
-#   ActiveMQ shell script
-#
-#   This script is heavily based on the Ant script
-#
-#   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.
+# ------------------------------------------------------------------------
+# 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.
+# ------------------------------------------------------------------------
 
 # load system-wide activemq configuration
 if [ -f "/etc/activemq.conf" ] ; then

Modified: incubator/activemq/trunk/assembly/src/release/bin/shutdown.bat
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/src/release/bin/shutdown.bat?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/bin/shutdown.bat (original)
+++ incubator/activemq/trunk/assembly/src/release/bin/shutdown.bat Thu Jul 27 22:00:24 2006
@@ -1,22 +1,21 @@
 @echo off
 
-REM   ActiveMQ shell script
+REM ------------------------------------------------------------------------
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements.  See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM the License.  You may obtain a copy of the License at
 REM
-REM   This script is heavily based on the Ant script
+REM http://www.apache.org/licenses/LICENSE-2.0
 REM
-REM   Copyright 2005-2006 The Apache Software Foundation
-REM
-REM   Licensed under the Apache License, Version 2.0 (the "License");
-REM   you may not use this file except in compliance with the License.
-REM   You may obtain a copy of the License at
-REM
-REM   http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM   Unless required by applicable law or agreed to in writing, software
-REM   distributed under the License is distributed on an "AS IS" BASIS,
-REM   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM   See the License for the specific language governing permissions and
-REM   limitations under the License.
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+REM ------------------------------------------------------------------------
 
 if exist "%HOME%\activemqrc_pre.bat" call "%HOME%\activemqrc_pre.bat"
 

Modified: incubator/activemq/trunk/openwire-c/src/examples/main.c
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/openwire-c/src/examples/main.c?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-c/src/examples/main.c (original)
+++ incubator/activemq/trunk/openwire-c/src/examples/main.c Thu Jul 27 22:00:24 2006
@@ -1,19 +1,21 @@
 /**
  *
- * Copyright 2005-2006 The Apache Software Foundation
+ * 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
  *
- *  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
  *
- *     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.
+ * 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 <stdlib.h>
 #include "amqcs.h"

Modified: incubator/activemq/trunk/openwire-c/src/libactivemq/amqcs.c
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/openwire-c/src/libactivemq/amqcs.c?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-c/src/libactivemq/amqcs.c (original)
+++ incubator/activemq/trunk/openwire-c/src/libactivemq/amqcs.c Thu Jul 27 22:00:24 2006
@@ -1,33 +1,21 @@
 /**
  *
- * Copyright 2005-2006 The Apache Software Foundation
+ * 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
  *
- *  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
  *
- *     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.
+ * 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 "amqcs.h"
-
-#include <apr.h>
-#include "amqcs.h"
-
-#ifdef WIN32
-#define snprintf _snprintf
-#endif
-
-static ow_byte ACTIVEMQ_MAGIC [] = {0x41,0x63,0x74,0x69,0x76,0x65,0x4D,0x51}; // ActiveMQ
-
-/**
-* An ActiveMQ Single Threaded Client Connection
- */ 
+ 
 struct amqcs_connection {
    ow_transport *transport;
    ow_ConnectionInfo *info;

Modified: incubator/activemq/trunk/openwire-c/src/libactivemq/amqcs.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/openwire-c/src/libactivemq/amqcs.h?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-c/src/libactivemq/amqcs.h (original)
+++ incubator/activemq/trunk/openwire-c/src/libactivemq/amqcs.h Thu Jul 27 22:00:24 2006
@@ -1,19 +1,21 @@
 /**
  *
- * Copyright 2005-2006 The Apache Software Foundation
+ * 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
  *
- *  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
  *
- *     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.
+ * 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 AMQCS_H
 #define AMQCS_H

Modified: incubator/activemq/trunk/openwire-c/src/libopenwire/ow.c
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/openwire-c/src/libopenwire/ow.c?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-c/src/libopenwire/ow.c (original)
+++ incubator/activemq/trunk/openwire-c/src/libopenwire/ow.c Thu Jul 27 22:00:24 2006
@@ -1,19 +1,21 @@
 /**
  *
- * Copyright 2005-2006 The Apache Software Foundation
+ * 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
  *
- *  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
  *
- *     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.
+ * 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 <stdlib.h>
 

Modified: incubator/activemq/trunk/openwire-c/src/libopenwire/ow.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/openwire-c/src/libopenwire/ow.h?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-c/src/libopenwire/ow.h (original)
+++ incubator/activemq/trunk/openwire-c/src/libopenwire/ow.h Thu Jul 27 22:00:24 2006
@@ -1,19 +1,21 @@
 /**
  *
- * Copyright 2005-2006 The Apache Software Foundation
+ * 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
  *
- *  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
  *
- *     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.
+ * 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 AMQC_H
 #define AMQC_H

Modified: incubator/activemq/trunk/openwire-c/src/libopenwire/ow_buffer.c
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/openwire-c/src/libopenwire/ow_buffer.c?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-c/src/libopenwire/ow_buffer.c (original)
+++ incubator/activemq/trunk/openwire-c/src/libopenwire/ow_buffer.c Thu Jul 27 22:00:24 2006
@@ -1,19 +1,21 @@
 /**
  *
- * Copyright 2005-2006 The Apache Software Foundation
+ * 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
  *
- *  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
  *
- *     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.
+ * 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 "ow.h"
 

Modified: incubator/activemq/trunk/openwire-c/src/libopenwire/ow_command_types_v1.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/openwire-c/src/libopenwire/ow_command_types_v1.h?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-c/src/libopenwire/ow_command_types_v1.h (original)
+++ incubator/activemq/trunk/openwire-c/src/libopenwire/ow_command_types_v1.h Thu Jul 27 22:00:24 2006
@@ -1,19 +1,21 @@
 /**
  *
- * Copyright 2005-2006 The Apache Software Foundation
+ * 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
  *
- *  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
  *
- *     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.
+ * 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 OW_COMMAND_TYPES_V1_H
 #define OW_COMMAND_TYPES_V1_H

Modified: incubator/activemq/trunk/openwire-c/src/libopenwire/ow_marshal.c
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/openwire-c/src/libopenwire/ow_marshal.c?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-c/src/libopenwire/ow_marshal.c (original)
+++ incubator/activemq/trunk/openwire-c/src/libopenwire/ow_marshal.c Thu Jul 27 22:00:24 2006
@@ -1,19 +1,21 @@
 /**
  *
- * Copyright 2005-2006 The Apache Software Foundation
+ * 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
  *
- *  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
  *
- *     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.
+ * 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 "ow.h"
 #include "ow_commands_v1.h"

Modified: incubator/activemq/trunk/sandbox/jabber/src/java/org/activemq/transport/jabber/JabberWireFormat.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/sandbox/jabber/src/java/org/activemq/transport/jabber/JabberWireFormat.java?rev=426384&r1=426383&r2=426384&view=diff
==============================================================================
--- incubator/activemq/trunk/sandbox/jabber/src/java/org/activemq/transport/jabber/JabberWireFormat.java (original)
+++ incubator/activemq/trunk/sandbox/jabber/src/java/org/activemq/transport/jabber/JabberWireFormat.java Thu Jul 27 22:00:24 2006
@@ -1,20 +1,20 @@
-/** 
- * 
- * Copyright 2004 Protique Ltd
- * 
- * 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
- * 
+ *
  * 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. 
- * 
- **/
+ * 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.activemq.transport.jabber;
 
 import java.io.DataInput;



Mime
View raw message