diff --git a/activecluster/src/java/org/activecluster/Cluster.java b/activecluster/src/java/org/activecluster/Cluster.java
index 468ce7adfe..3e48237f9e 100644
--- a/activecluster/src/java/org/activecluster/Cluster.java
+++ b/activecluster/src/java/org/activecluster/Cluster.java
@@ -1,21 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
-
+ * 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.activecluster;
import java.io.Serializable;
diff --git a/activecluster/src/java/org/activecluster/ClusterEvent.java b/activecluster/src/java/org/activecluster/ClusterEvent.java
index afb0194a67..9ab6213535 100644
--- a/activecluster/src/java/org/activecluster/ClusterEvent.java
+++ b/activecluster/src/java/org/activecluster/ClusterEvent.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster;
import java.io.Externalizable;
diff --git a/activecluster/src/java/org/activecluster/ClusterException.java b/activecluster/src/java/org/activecluster/ClusterException.java
index f8d3ce9b6a..1fa9e7d22b 100644
--- a/activecluster/src/java/org/activecluster/ClusterException.java
+++ b/activecluster/src/java/org/activecluster/ClusterException.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster;
diff --git a/activecluster/src/java/org/activecluster/ClusterFactory.java b/activecluster/src/java/org/activecluster/ClusterFactory.java
index ca753eb77e..4fb43e1044 100644
--- a/activecluster/src/java/org/activecluster/ClusterFactory.java
+++ b/activecluster/src/java/org/activecluster/ClusterFactory.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster;
diff --git a/activecluster/src/java/org/activecluster/ClusterListener.java b/activecluster/src/java/org/activecluster/ClusterListener.java
index ff224dfc30..6a7abf9f1d 100644
--- a/activecluster/src/java/org/activecluster/ClusterListener.java
+++ b/activecluster/src/java/org/activecluster/ClusterListener.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster;
diff --git a/activecluster/src/java/org/activecluster/LocalNode.java b/activecluster/src/java/org/activecluster/LocalNode.java
index eb829f4355..fc2a1904bd 100644
--- a/activecluster/src/java/org/activecluster/LocalNode.java
+++ b/activecluster/src/java/org/activecluster/LocalNode.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster;
import javax.jms.JMSException;
diff --git a/activecluster/src/java/org/activecluster/Node.java b/activecluster/src/java/org/activecluster/Node.java
index 6889ba2a0a..976424b3e3 100644
--- a/activecluster/src/java/org/activecluster/Node.java
+++ b/activecluster/src/java/org/activecluster/Node.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster;
import java.io.Serializable;
diff --git a/activecluster/src/java/org/activecluster/Service.java b/activecluster/src/java/org/activecluster/Service.java
index aade1e2a91..5fb3ec754d 100644
--- a/activecluster/src/java/org/activecluster/Service.java
+++ b/activecluster/src/java/org/activecluster/Service.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster;
diff --git a/activecluster/src/java/org/activecluster/election/ElectionStrategy.java b/activecluster/src/java/org/activecluster/election/ElectionStrategy.java
index f5bf561118..367d9f2a92 100644
--- a/activecluster/src/java/org/activecluster/election/ElectionStrategy.java
+++ b/activecluster/src/java/org/activecluster/election/ElectionStrategy.java
@@ -1,21 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
-
+ * 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.activecluster.election;
import javax.jms.JMSException;
diff --git a/activecluster/src/java/org/activecluster/election/impl/BullyElectionStrategy.java b/activecluster/src/java/org/activecluster/election/impl/BullyElectionStrategy.java
index 05ef946b1e..3f1565c6f1 100644
--- a/activecluster/src/java/org/activecluster/election/impl/BullyElectionStrategy.java
+++ b/activecluster/src/java/org/activecluster/election/impl/BullyElectionStrategy.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster.election.impl;
diff --git a/activecluster/src/java/org/activecluster/group/BuddyGroupModel.java b/activecluster/src/java/org/activecluster/group/BuddyGroupModel.java
index 5bd3c73bc0..b88e40247a 100644
--- a/activecluster/src/java/org/activecluster/group/BuddyGroupModel.java
+++ b/activecluster/src/java/org/activecluster/group/BuddyGroupModel.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster.group;
import org.activecluster.Node;
diff --git a/activecluster/src/java/org/activecluster/group/Group.java b/activecluster/src/java/org/activecluster/group/Group.java
index 97795aa55f..2af4c32562 100644
--- a/activecluster/src/java/org/activecluster/group/Group.java
+++ b/activecluster/src/java/org/activecluster/group/Group.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster.group;
import org.activecluster.Node;
diff --git a/activecluster/src/java/org/activecluster/group/GroupClusterListener.java b/activecluster/src/java/org/activecluster/group/GroupClusterListener.java
index f973a47d37..8542c3f4b0 100644
--- a/activecluster/src/java/org/activecluster/group/GroupClusterListener.java
+++ b/activecluster/src/java/org/activecluster/group/GroupClusterListener.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster.group;
import org.activecluster.ClusterEvent;
diff --git a/activecluster/src/java/org/activecluster/group/GroupModel.java b/activecluster/src/java/org/activecluster/group/GroupModel.java
index ae3f238cfe..50b19e69b4 100644
--- a/activecluster/src/java/org/activecluster/group/GroupModel.java
+++ b/activecluster/src/java/org/activecluster/group/GroupModel.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster.group;
import org.activecluster.Node;
diff --git a/activecluster/src/java/org/activecluster/group/MasterZoneFilter.java b/activecluster/src/java/org/activecluster/group/MasterZoneFilter.java
index 369b74c284..70129e32aa 100644
--- a/activecluster/src/java/org/activecluster/group/MasterZoneFilter.java
+++ b/activecluster/src/java/org/activecluster/group/MasterZoneFilter.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster.group;
import org.activecluster.Node;
diff --git a/activecluster/src/java/org/activecluster/group/Membership.java b/activecluster/src/java/org/activecluster/group/Membership.java
index 95d52a67a1..a1bc7d02fb 100644
--- a/activecluster/src/java/org/activecluster/group/Membership.java
+++ b/activecluster/src/java/org/activecluster/group/Membership.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster.group;
/**
diff --git a/activecluster/src/java/org/activecluster/group/NodeFilter.java b/activecluster/src/java/org/activecluster/group/NodeFilter.java
index 454cde1661..ebaaa400f2 100644
--- a/activecluster/src/java/org/activecluster/group/NodeFilter.java
+++ b/activecluster/src/java/org/activecluster/group/NodeFilter.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster.group;
import org.activecluster.Node;
diff --git a/activecluster/src/java/org/activecluster/group/NodeMemberships.java b/activecluster/src/java/org/activecluster/group/NodeMemberships.java
index be67b7d121..50bada2530 100644
--- a/activecluster/src/java/org/activecluster/group/NodeMemberships.java
+++ b/activecluster/src/java/org/activecluster/group/NodeMemberships.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster.group;
import org.activecluster.Node;
diff --git a/activecluster/src/java/org/activecluster/impl/ActiveMQClusterFactory.java b/activecluster/src/java/org/activecluster/impl/ActiveMQClusterFactory.java
index 01ea56dbf8..4d6e9eae14 100644
--- a/activecluster/src/java/org/activecluster/impl/ActiveMQClusterFactory.java
+++ b/activecluster/src/java/org/activecluster/impl/ActiveMQClusterFactory.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster.impl;
import org.activecluster.impl.DefaultClusterFactory;
diff --git a/activecluster/src/java/org/activecluster/impl/DefaultCluster.java b/activecluster/src/java/org/activecluster/impl/DefaultCluster.java
index 71b510cf7b..5f460c52ec 100644
--- a/activecluster/src/java/org/activecluster/impl/DefaultCluster.java
+++ b/activecluster/src/java/org/activecluster/impl/DefaultCluster.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster.impl;
import java.io.Serializable;
diff --git a/activecluster/src/java/org/activecluster/impl/DefaultClusterFactory.java b/activecluster/src/java/org/activecluster/impl/DefaultClusterFactory.java
index 71fb08e0b7..b531f8ea8b 100644
--- a/activecluster/src/java/org/activecluster/impl/DefaultClusterFactory.java
+++ b/activecluster/src/java/org/activecluster/impl/DefaultClusterFactory.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster.impl;
import java.util.Timer;
diff --git a/activecluster/src/java/org/activecluster/impl/NodeImpl.java b/activecluster/src/java/org/activecluster/impl/NodeImpl.java
index 64f0cace2a..7c4c29d322 100644
--- a/activecluster/src/java/org/activecluster/impl/NodeImpl.java
+++ b/activecluster/src/java/org/activecluster/impl/NodeImpl.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster.impl;
import java.util.HashMap;
diff --git a/activecluster/src/java/org/activecluster/impl/NonReplicatedLocalNode.java b/activecluster/src/java/org/activecluster/impl/NonReplicatedLocalNode.java
index 8ed2a58d23..c40078a9e0 100644
--- a/activecluster/src/java/org/activecluster/impl/NonReplicatedLocalNode.java
+++ b/activecluster/src/java/org/activecluster/impl/NonReplicatedLocalNode.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster.impl;
import java.util.Map;
diff --git a/activecluster/src/java/org/activecluster/impl/ReplicatedLocalNode.java b/activecluster/src/java/org/activecluster/impl/ReplicatedLocalNode.java
index eb58ae3710..fb45cefe41 100644
--- a/activecluster/src/java/org/activecluster/impl/ReplicatedLocalNode.java
+++ b/activecluster/src/java/org/activecluster/impl/ReplicatedLocalNode.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster.impl;
import java.util.Map;
diff --git a/activecluster/src/java/org/activecluster/impl/StateConsumer.java b/activecluster/src/java/org/activecluster/impl/StateConsumer.java
index aaaaf6e0a1..17ee70e926 100644
--- a/activecluster/src/java/org/activecluster/impl/StateConsumer.java
+++ b/activecluster/src/java/org/activecluster/impl/StateConsumer.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster.impl;
import org.apache.commons.logging.Log;
diff --git a/activecluster/src/java/org/activecluster/impl/StateService.java b/activecluster/src/java/org/activecluster/impl/StateService.java
index f6f5f02639..6d63aad6af 100644
--- a/activecluster/src/java/org/activecluster/impl/StateService.java
+++ b/activecluster/src/java/org/activecluster/impl/StateService.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster.impl;
import org.activecluster.Node;
diff --git a/activecluster/src/java/org/activecluster/impl/StateServiceImpl.java b/activecluster/src/java/org/activecluster/impl/StateServiceImpl.java
index 6830e85d81..f2c4a2abe3 100644
--- a/activecluster/src/java/org/activecluster/impl/StateServiceImpl.java
+++ b/activecluster/src/java/org/activecluster/impl/StateServiceImpl.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster.impl;
import java.util.HashMap;
diff --git a/activecluster/src/java/org/activecluster/impl/StateServiceStub.java b/activecluster/src/java/org/activecluster/impl/StateServiceStub.java
index 457221781b..4adb17b10e 100644
--- a/activecluster/src/java/org/activecluster/impl/StateServiceStub.java
+++ b/activecluster/src/java/org/activecluster/impl/StateServiceStub.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster.impl;
import org.apache.commons.logging.Log;
diff --git a/activecluster/src/test/org/activecluster/ChatDemo.java b/activecluster/src/test/org/activecluster/ChatDemo.java
index 4a04abd4b5..8104f3aed6 100644
--- a/activecluster/src/test/org/activecluster/ChatDemo.java
+++ b/activecluster/src/test/org/activecluster/ChatDemo.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster;
import java.io.BufferedReader;
diff --git a/activecluster/src/test/org/activecluster/ClusterDemo.java b/activecluster/src/test/org/activecluster/ClusterDemo.java
index 30d303c1e2..25178aca69 100644
--- a/activecluster/src/test/org/activecluster/ClusterDemo.java
+++ b/activecluster/src/test/org/activecluster/ClusterDemo.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster;
import org.activecluster.impl.ActiveMQClusterFactory;
diff --git a/activecluster/src/test/org/activecluster/ClusterFunctionTest.java b/activecluster/src/test/org/activecluster/ClusterFunctionTest.java
index 0489a5ff8f..8f9d14fe9a 100644
--- a/activecluster/src/test/org/activecluster/ClusterFunctionTest.java
+++ b/activecluster/src/test/org/activecluster/ClusterFunctionTest.java
@@ -1,19 +1,18 @@
/**
*
- * Copyright 2003-2004 The Apache Software Foundation
+ * Copyright 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
+ * 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.
*/
package org.activecluster;
diff --git a/activecluster/src/test/org/activecluster/ClusterTest.java b/activecluster/src/test/org/activecluster/ClusterTest.java
index 07b52977a9..7d3d9c4f1e 100644
--- a/activecluster/src/test/org/activecluster/ClusterTest.java
+++ b/activecluster/src/test/org/activecluster/ClusterTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster;
import java.util.List;
diff --git a/activecluster/src/test/org/activecluster/ClusterTestSupport.java b/activecluster/src/test/org/activecluster/ClusterTestSupport.java
index f813ac4525..c9fcc752d8 100644
--- a/activecluster/src/test/org/activecluster/ClusterTestSupport.java
+++ b/activecluster/src/test/org/activecluster/ClusterTestSupport.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster;
import org.activecluster.impl.ActiveMQClusterFactory;
diff --git a/activecluster/src/test/org/activecluster/StubMessageListener.java b/activecluster/src/test/org/activecluster/StubMessageListener.java
index d7d6bdc2fc..e5502b76ce 100644
--- a/activecluster/src/test/org/activecluster/StubMessageListener.java
+++ b/activecluster/src/test/org/activecluster/StubMessageListener.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster;
import javax.jms.Message;
diff --git a/activecluster/src/test/org/activecluster/TestSupport.java b/activecluster/src/test/org/activecluster/TestSupport.java
index d8e17c9c8e..be17153e42 100644
--- a/activecluster/src/test/org/activecluster/TestSupport.java
+++ b/activecluster/src/test/org/activecluster/TestSupport.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster;
import junit.framework.TestCase;
diff --git a/activecluster/src/test/org/activecluster/TestingClusterListener.java b/activecluster/src/test/org/activecluster/TestingClusterListener.java
index e28af9e69f..c56268befa 100644
--- a/activecluster/src/test/org/activecluster/TestingClusterListener.java
+++ b/activecluster/src/test/org/activecluster/TestingClusterListener.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster;
import org.activecluster.impl.DefaultCluster;
diff --git a/activecluster/src/test/org/activecluster/group/BuddyGroupModelTest.java b/activecluster/src/test/org/activecluster/group/BuddyGroupModelTest.java
index 30e86191a2..18a045deb6 100644
--- a/activecluster/src/test/org/activecluster/group/BuddyGroupModelTest.java
+++ b/activecluster/src/test/org/activecluster/group/BuddyGroupModelTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster.group;
import java.util.List;
diff --git a/activecluster/src/test/org/activecluster/group/GroupModelTest.java b/activecluster/src/test/org/activecluster/group/GroupModelTest.java
index 0b408968bf..f08511419e 100644
--- a/activecluster/src/test/org/activecluster/group/GroupModelTest.java
+++ b/activecluster/src/test/org/activecluster/group/GroupModelTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster.group;
import java.util.List;
diff --git a/activecluster/src/test/org/activecluster/group/GroupTestSupport.java b/activecluster/src/test/org/activecluster/group/GroupTestSupport.java
index faa38a9425..4e24bb3a85 100644
--- a/activecluster/src/test/org/activecluster/group/GroupTestSupport.java
+++ b/activecluster/src/test/org/activecluster/group/GroupTestSupport.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activecluster.group;
import java.util.HashMap;
diff --git a/activeio/activeio-core/src/java/org/activeio/AcceptListener.java b/activeio/activeio-core/src/java/org/activeio/AcceptListener.java
index 82501ec757..cbfe6fecd6 100644
--- a/activeio/activeio-core/src/java/org/activeio/AcceptListener.java
+++ b/activeio/activeio-core/src/java/org/activeio/AcceptListener.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio;
diff --git a/activeio/activeio-core/src/java/org/activeio/Adaptable.java b/activeio/activeio-core/src/java/org/activeio/Adaptable.java
index cbf3dcb171..9b625d4183 100644
--- a/activeio/activeio-core/src/java/org/activeio/Adaptable.java
+++ b/activeio/activeio-core/src/java/org/activeio/Adaptable.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio;
diff --git a/activeio/activeio-core/src/java/org/activeio/Channel.java b/activeio/activeio-core/src/java/org/activeio/Channel.java
index b4cad7105a..356c3f8b91 100644
--- a/activeio/activeio-core/src/java/org/activeio/Channel.java
+++ b/activeio/activeio-core/src/java/org/activeio/Channel.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio;
diff --git a/activeio/activeio-core/src/java/org/activeio/ChannelFactory.java b/activeio/activeio-core/src/java/org/activeio/ChannelFactory.java
index 7022fe70e7..e947415a2f 100644
--- a/activeio/activeio-core/src/java/org/activeio/ChannelFactory.java
+++ b/activeio/activeio-core/src/java/org/activeio/ChannelFactory.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/ChannelServer.java b/activeio/activeio-core/src/java/org/activeio/ChannelServer.java
index 43d84b7086..67a22648fb 100644
--- a/activeio/activeio-core/src/java/org/activeio/ChannelServer.java
+++ b/activeio/activeio-core/src/java/org/activeio/ChannelServer.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio;
diff --git a/activeio/activeio-core/src/java/org/activeio/Service.java b/activeio/activeio-core/src/java/org/activeio/Service.java
index ac3a6054c2..6c9b1a21ae 100644
--- a/activeio/activeio-core/src/java/org/activeio/Service.java
+++ b/activeio/activeio-core/src/java/org/activeio/Service.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio;
diff --git a/activeio/activeio-core/src/java/org/activeio/adapter/AsyncChannelToOutputStream.java b/activeio/activeio-core/src/java/org/activeio/adapter/AsyncChannelToOutputStream.java
index b3eca50f0c..5f5874a3f6 100644
--- a/activeio/activeio-core/src/java/org/activeio/adapter/AsyncChannelToOutputStream.java
+++ b/activeio/activeio-core/src/java/org/activeio/adapter/AsyncChannelToOutputStream.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio.adapter;
diff --git a/activeio/activeio-core/src/java/org/activeio/adapter/AsyncToSyncChannel.java b/activeio/activeio-core/src/java/org/activeio/adapter/AsyncToSyncChannel.java
index cd8cebd2b9..4410fbc7c6 100644
--- a/activeio/activeio-core/src/java/org/activeio/adapter/AsyncToSyncChannel.java
+++ b/activeio/activeio-core/src/java/org/activeio/adapter/AsyncToSyncChannel.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.adapter;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/adapter/AsyncToSyncChannelFactory.java b/activeio/activeio-core/src/java/org/activeio/adapter/AsyncToSyncChannelFactory.java
index ec91053116..8919af7bf8 100644
--- a/activeio/activeio-core/src/java/org/activeio/adapter/AsyncToSyncChannelFactory.java
+++ b/activeio/activeio-core/src/java/org/activeio/adapter/AsyncToSyncChannelFactory.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.adapter;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/adapter/AsyncToSyncChannelServer.java b/activeio/activeio-core/src/java/org/activeio/adapter/AsyncToSyncChannelServer.java
index e5db8088cd..a8cdae5ad1 100644
--- a/activeio/activeio-core/src/java/org/activeio/adapter/AsyncToSyncChannelServer.java
+++ b/activeio/activeio-core/src/java/org/activeio/adapter/AsyncToSyncChannelServer.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.adapter;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/adapter/PacketByteArrayOutputStream.java b/activeio/activeio-core/src/java/org/activeio/adapter/PacketByteArrayOutputStream.java
index ff2e952ac7..eb5327a3e0 100644
--- a/activeio/activeio-core/src/java/org/activeio/adapter/PacketByteArrayOutputStream.java
+++ b/activeio/activeio-core/src/java/org/activeio/adapter/PacketByteArrayOutputStream.java
@@ -1,20 +1,19 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.adapter;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/adapter/PacketInputStream.java b/activeio/activeio-core/src/java/org/activeio/adapter/PacketInputStream.java
index 04f5c454fb..42e750db68 100644
--- a/activeio/activeio-core/src/java/org/activeio/adapter/PacketInputStream.java
+++ b/activeio/activeio-core/src/java/org/activeio/adapter/PacketInputStream.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2005 the original author or authors.
+ * Copyright 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
+ * 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.
*/
package org.activeio.adapter;
diff --git a/activeio/activeio-core/src/java/org/activeio/adapter/PacketOutputStream.java b/activeio/activeio-core/src/java/org/activeio/adapter/PacketOutputStream.java
index 5f90e50631..2a22fd9d71 100644
--- a/activeio/activeio-core/src/java/org/activeio/adapter/PacketOutputStream.java
+++ b/activeio/activeio-core/src/java/org/activeio/adapter/PacketOutputStream.java
@@ -1,19 +1,19 @@
/**
-*
-* Copyright 2004 Hiram Chirino
-*
-* 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.
-*/
+ *
+ * Copyright 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.
+ */
package org.activeio.adapter;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/adapter/PacketToInputStream.java b/activeio/activeio-core/src/java/org/activeio/adapter/PacketToInputStream.java
index 01cb461bd1..c07cfe7bc5 100644
--- a/activeio/activeio-core/src/java/org/activeio/adapter/PacketToInputStream.java
+++ b/activeio/activeio-core/src/java/org/activeio/adapter/PacketToInputStream.java
@@ -1,19 +1,19 @@
/**
-*
-* Copyright 2004 Hiram Chirino
-*
-* 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.
-*/
+ *
+ * Copyright 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.
+ */
package org.activeio.adapter;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/adapter/SyncChannelServerToServerSocket.java b/activeio/activeio-core/src/java/org/activeio/adapter/SyncChannelServerToServerSocket.java
index a034efd484..fc15a0ce4f 100644
--- a/activeio/activeio-core/src/java/org/activeio/adapter/SyncChannelServerToServerSocket.java
+++ b/activeio/activeio-core/src/java/org/activeio/adapter/SyncChannelServerToServerSocket.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio.adapter;
diff --git a/activeio/activeio-core/src/java/org/activeio/adapter/SyncChannelToInputStream.java b/activeio/activeio-core/src/java/org/activeio/adapter/SyncChannelToInputStream.java
index ac575fd8c9..8816812346 100644
--- a/activeio/activeio-core/src/java/org/activeio/adapter/SyncChannelToInputStream.java
+++ b/activeio/activeio-core/src/java/org/activeio/adapter/SyncChannelToInputStream.java
@@ -1,19 +1,19 @@
/**
-*
-* Copyright 2004 Hiram Chirino
-*
-* 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.
-*/
+ *
+ * Copyright 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.
+ */
package org.activeio.adapter;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/adapter/SyncChannelToOutputStream.java b/activeio/activeio-core/src/java/org/activeio/adapter/SyncChannelToOutputStream.java
index 54bd344963..b81bc878a9 100644
--- a/activeio/activeio-core/src/java/org/activeio/adapter/SyncChannelToOutputStream.java
+++ b/activeio/activeio-core/src/java/org/activeio/adapter/SyncChannelToOutputStream.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio.adapter;
diff --git a/activeio/activeio-core/src/java/org/activeio/adapter/SyncChannelToSocket.java b/activeio/activeio-core/src/java/org/activeio/adapter/SyncChannelToSocket.java
index 8b1ebd92fd..169b3459c1 100644
--- a/activeio/activeio-core/src/java/org/activeio/adapter/SyncChannelToSocket.java
+++ b/activeio/activeio-core/src/java/org/activeio/adapter/SyncChannelToSocket.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio.adapter;
diff --git a/activeio/activeio-core/src/java/org/activeio/adapter/SyncToAsyncChannel.java b/activeio/activeio-core/src/java/org/activeio/adapter/SyncToAsyncChannel.java
index 933c9cfaff..a744f4fa89 100644
--- a/activeio/activeio-core/src/java/org/activeio/adapter/SyncToAsyncChannel.java
+++ b/activeio/activeio-core/src/java/org/activeio/adapter/SyncToAsyncChannel.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.adapter;
import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
diff --git a/activeio/activeio-core/src/java/org/activeio/adapter/SyncToAsyncChannelFactory.java b/activeio/activeio-core/src/java/org/activeio/adapter/SyncToAsyncChannelFactory.java
index 8cc0499d00..67bc4511aa 100644
--- a/activeio/activeio-core/src/java/org/activeio/adapter/SyncToAsyncChannelFactory.java
+++ b/activeio/activeio-core/src/java/org/activeio/adapter/SyncToAsyncChannelFactory.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.adapter;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/adapter/SyncToAsyncChannelServer.java b/activeio/activeio-core/src/java/org/activeio/adapter/SyncToAsyncChannelServer.java
index c8249743b7..9158de3169 100644
--- a/activeio/activeio-core/src/java/org/activeio/adapter/SyncToAsyncChannelServer.java
+++ b/activeio/activeio-core/src/java/org/activeio/adapter/SyncToAsyncChannelServer.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.adapter;
diff --git a/activeio/activeio-core/src/java/org/activeio/adapter/SynchToAsynchChannelAdapter.java b/activeio/activeio-core/src/java/org/activeio/adapter/SynchToAsynchChannelAdapter.java
index c3cce5b977..877c7e37f9 100644
--- a/activeio/activeio-core/src/java/org/activeio/adapter/SynchToAsynchChannelAdapter.java
+++ b/activeio/activeio-core/src/java/org/activeio/adapter/SynchToAsynchChannelAdapter.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2005 the original author or authors.
+ * Copyright 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
+ * 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.
*/
package org.activeio.adapter;
diff --git a/activeio/activeio-core/src/java/org/activeio/command/AsyncChannelToAsyncCommandChannel.java b/activeio/activeio-core/src/java/org/activeio/command/AsyncChannelToAsyncCommandChannel.java
index 1e5e84cf95..1ac6b1bfff 100644
--- a/activeio/activeio-core/src/java/org/activeio/command/AsyncChannelToAsyncCommandChannel.java
+++ b/activeio/activeio-core/src/java/org/activeio/command/AsyncChannelToAsyncCommandChannel.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.command;
import org.activeio.packet.EOSPacket;
diff --git a/activeio/activeio-core/src/java/org/activeio/command/AsyncCommandChannel.java b/activeio/activeio-core/src/java/org/activeio/command/AsyncCommandChannel.java
index 9416b64f4e..6367a95cc8 100644
--- a/activeio/activeio-core/src/java/org/activeio/command/AsyncCommandChannel.java
+++ b/activeio/activeio-core/src/java/org/activeio/command/AsyncCommandChannel.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2005 James Strachan
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.command;
import org.activeio.Channel;
diff --git a/activeio/activeio-core/src/java/org/activeio/command/ClassLoading.java b/activeio/activeio-core/src/java/org/activeio/command/ClassLoading.java
index 61bc85e0b5..9516178c6e 100644
--- a/activeio/activeio-core/src/java/org/activeio/command/ClassLoading.java
+++ b/activeio/activeio-core/src/java/org/activeio/command/ClassLoading.java
@@ -2,17 +2,17 @@
*
* Copyright 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
+ * 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.
*/
package org.activeio.command;
diff --git a/activeio/activeio-core/src/java/org/activeio/command/ClassLoadingAwareObjectInputStream.java b/activeio/activeio-core/src/java/org/activeio/command/ClassLoadingAwareObjectInputStream.java
index f7f81f39aa..f21f323c53 100644
--- a/activeio/activeio-core/src/java/org/activeio/command/ClassLoadingAwareObjectInputStream.java
+++ b/activeio/activeio-core/src/java/org/activeio/command/ClassLoadingAwareObjectInputStream.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2005 James Strachan
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.command;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/command/CommandListener.java b/activeio/activeio-core/src/java/org/activeio/command/CommandListener.java
index 7a0f8aa4b0..540a1d097d 100644
--- a/activeio/activeio-core/src/java/org/activeio/command/CommandListener.java
+++ b/activeio/activeio-core/src/java/org/activeio/command/CommandListener.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.command;
diff --git a/activeio/activeio-core/src/java/org/activeio/command/DefaultWireFormat.java b/activeio/activeio-core/src/java/org/activeio/command/DefaultWireFormat.java
index 61f48a2874..946de4b4ec 100644
--- a/activeio/activeio-core/src/java/org/activeio/command/DefaultWireFormat.java
+++ b/activeio/activeio-core/src/java/org/activeio/command/DefaultWireFormat.java
@@ -1,20 +1,19 @@
/**
- *
- * Copyright 2005 James Strachan
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.command;
import java.io.DataInputStream;
diff --git a/activeio/activeio-core/src/java/org/activeio/command/WireFormat.java b/activeio/activeio-core/src/java/org/activeio/command/WireFormat.java
index fe4f92863c..0762bfb7f3 100644
--- a/activeio/activeio-core/src/java/org/activeio/command/WireFormat.java
+++ b/activeio/activeio-core/src/java/org/activeio/command/WireFormat.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2005 James Strachan
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.command;
import java.io.DataInputStream;
diff --git a/activeio/activeio-core/src/java/org/activeio/command/WireFormatFactory.java b/activeio/activeio-core/src/java/org/activeio/command/WireFormatFactory.java
index 8a8b576c20..a7c48dfd45 100644
--- a/activeio/activeio-core/src/java/org/activeio/command/WireFormatFactory.java
+++ b/activeio/activeio-core/src/java/org/activeio/command/WireFormatFactory.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activeio.command;
public interface WireFormatFactory {
diff --git a/activeio/activeio-core/src/java/org/activeio/journal/InvalidRecordLocationException.java b/activeio/activeio-core/src/java/org/activeio/journal/InvalidRecordLocationException.java
index 70dce59635..b49104e3a7 100644
--- a/activeio/activeio-core/src/java/org/activeio/journal/InvalidRecordLocationException.java
+++ b/activeio/activeio-core/src/java/org/activeio/journal/InvalidRecordLocationException.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.activeio.journal;
/**
diff --git a/activeio/activeio-core/src/java/org/activeio/journal/Journal.java b/activeio/activeio-core/src/java/org/activeio/journal/Journal.java
index 0baa90ba47..d99b1cd796 100644
--- a/activeio/activeio-core/src/java/org/activeio/journal/Journal.java
+++ b/activeio/activeio-core/src/java/org/activeio/journal/Journal.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.activeio.journal;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/journal/JournalEventListener.java b/activeio/activeio-core/src/java/org/activeio/journal/JournalEventListener.java
index 44427e063c..c70a476e22 100644
--- a/activeio/activeio-core/src/java/org/activeio/journal/JournalEventListener.java
+++ b/activeio/activeio-core/src/java/org/activeio/journal/JournalEventListener.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.activeio.journal;
/**
diff --git a/activeio/activeio-core/src/java/org/activeio/journal/RecordLocation.java b/activeio/activeio-core/src/java/org/activeio/journal/RecordLocation.java
index a48173d9a7..b078baf1ee 100644
--- a/activeio/activeio-core/src/java/org/activeio/journal/RecordLocation.java
+++ b/activeio/activeio-core/src/java/org/activeio/journal/RecordLocation.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.activeio.journal;
/**
diff --git a/activeio/activeio-core/src/java/org/activeio/journal/active/BatchedWrite.java b/activeio/activeio-core/src/java/org/activeio/journal/active/BatchedWrite.java
index 8f75ed35e0..ef53170268 100644
--- a/activeio/activeio-core/src/java/org/activeio/journal/active/BatchedWrite.java
+++ b/activeio/activeio-core/src/java/org/activeio/journal/active/BatchedWrite.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.activeio.journal.active;
import org.activeio.packet.Packet;
diff --git a/activeio/activeio-core/src/java/org/activeio/journal/active/ControlFile.java b/activeio/activeio-core/src/java/org/activeio/journal/active/ControlFile.java
index 527e108cc2..05666fe05b 100644
--- a/activeio/activeio-core/src/java/org/activeio/journal/active/ControlFile.java
+++ b/activeio/activeio-core/src/java/org/activeio/journal/active/ControlFile.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.activeio.journal.active;
import java.io.File;
diff --git a/activeio/activeio-core/src/java/org/activeio/journal/active/JournalImpl.java b/activeio/activeio-core/src/java/org/activeio/journal/active/JournalImpl.java
index c6b7cd9f05..844c0e6acd 100644
--- a/activeio/activeio-core/src/java/org/activeio/journal/active/JournalImpl.java
+++ b/activeio/activeio-core/src/java/org/activeio/journal/active/JournalImpl.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.activeio.journal.active;
import java.io.File;
diff --git a/activeio/activeio-core/src/java/org/activeio/journal/active/Location.java b/activeio/activeio-core/src/java/org/activeio/journal/active/Location.java
index a5cbdffe53..0a1c79f4e9 100644
--- a/activeio/activeio-core/src/java/org/activeio/journal/active/Location.java
+++ b/activeio/activeio-core/src/java/org/activeio/journal/active/Location.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.activeio.journal.active;
import java.io.DataInput;
diff --git a/activeio/activeio-core/src/java/org/activeio/journal/active/LogFile.java b/activeio/activeio-core/src/java/org/activeio/journal/active/LogFile.java
index 4b2fac8c89..5eb29fa9db 100644
--- a/activeio/activeio-core/src/java/org/activeio/journal/active/LogFile.java
+++ b/activeio/activeio-core/src/java/org/activeio/journal/active/LogFile.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.activeio.journal.active;
import java.io.File;
diff --git a/activeio/activeio-core/src/java/org/activeio/journal/active/LogFileManager.java b/activeio/activeio-core/src/java/org/activeio/journal/active/LogFileManager.java
index 0343a0e311..85ee411d2b 100644
--- a/activeio/activeio-core/src/java/org/activeio/journal/active/LogFileManager.java
+++ b/activeio/activeio-core/src/java/org/activeio/journal/active/LogFileManager.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.activeio.journal.active;
import java.io.DataInput;
diff --git a/activeio/activeio-core/src/java/org/activeio/journal/active/LogFileNode.java b/activeio/activeio-core/src/java/org/activeio/journal/active/LogFileNode.java
index 37eda421e8..cd08ac111f 100644
--- a/activeio/activeio-core/src/java/org/activeio/journal/active/LogFileNode.java
+++ b/activeio/activeio-core/src/java/org/activeio/journal/active/LogFileNode.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.activeio.journal.active;
import java.io.DataInput;
diff --git a/activeio/activeio-core/src/java/org/activeio/journal/active/Record.java b/activeio/activeio-core/src/java/org/activeio/journal/active/Record.java
index 8f46c54377..ffc8369fbb 100644
--- a/activeio/activeio-core/src/java/org/activeio/journal/active/Record.java
+++ b/activeio/activeio-core/src/java/org/activeio/journal/active/Record.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.activeio.journal.active;
import java.io.DataInput;
diff --git a/activeio/activeio-core/src/java/org/activeio/journal/active/RecordInfo.java b/activeio/activeio-core/src/java/org/activeio/journal/active/RecordInfo.java
index 6269faa520..e23cbb95e5 100644
--- a/activeio/activeio-core/src/java/org/activeio/journal/active/RecordInfo.java
+++ b/activeio/activeio-core/src/java/org/activeio/journal/active/RecordInfo.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.activeio.journal.active;
/**
diff --git a/activeio/activeio-core/src/java/org/activeio/journal/howl/HowlJournal.java b/activeio/activeio-core/src/java/org/activeio/journal/howl/HowlJournal.java
index 5bd68e5cce..2f6d266faf 100644
--- a/activeio/activeio-core/src/java/org/activeio/journal/howl/HowlJournal.java
+++ b/activeio/activeio-core/src/java/org/activeio/journal/howl/HowlJournal.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.activeio.journal.howl;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/journal/howl/LongRecordLocation.java b/activeio/activeio-core/src/java/org/activeio/journal/howl/LongRecordLocation.java
index 4e34656adc..f8dd13d498 100644
--- a/activeio/activeio-core/src/java/org/activeio/journal/howl/LongRecordLocation.java
+++ b/activeio/activeio-core/src/java/org/activeio/journal/howl/LongRecordLocation.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.activeio.journal.howl;
import org.activeio.journal.RecordLocation;
diff --git a/activeio/activeio-core/src/java/org/activeio/oneport/HttpRecognizer.java b/activeio/activeio-core/src/java/org/activeio/oneport/HttpRecognizer.java
index b7fb7fe491..a7c22166c0 100644
--- a/activeio/activeio-core/src/java/org/activeio/oneport/HttpRecognizer.java
+++ b/activeio/activeio-core/src/java/org/activeio/oneport/HttpRecognizer.java
@@ -1,20 +1,19 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.oneport;
import java.util.HashSet;
diff --git a/activeio/activeio-core/src/java/org/activeio/oneport/IIOPRecognizer.java b/activeio/activeio-core/src/java/org/activeio/oneport/IIOPRecognizer.java
index c3643ff33b..28c70b50b7 100644
--- a/activeio/activeio-core/src/java/org/activeio/oneport/IIOPRecognizer.java
+++ b/activeio/activeio-core/src/java/org/activeio/oneport/IIOPRecognizer.java
@@ -1,20 +1,19 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.oneport;
import org.activeio.packet.Packet;
diff --git a/activeio/activeio-core/src/java/org/activeio/oneport/OnePortAsyncChannelServer.java b/activeio/activeio-core/src/java/org/activeio/oneport/OnePortAsyncChannelServer.java
index 94d6e91501..dc4f44ea46 100644
--- a/activeio/activeio-core/src/java/org/activeio/oneport/OnePortAsyncChannelServer.java
+++ b/activeio/activeio-core/src/java/org/activeio/oneport/OnePortAsyncChannelServer.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.oneport;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/oneport/ProtocolRecognizer.java b/activeio/activeio-core/src/java/org/activeio/oneport/ProtocolRecognizer.java
index eb43010352..0f762c798f 100644
--- a/activeio/activeio-core/src/java/org/activeio/oneport/ProtocolRecognizer.java
+++ b/activeio/activeio-core/src/java/org/activeio/oneport/ProtocolRecognizer.java
@@ -1,20 +1,19 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.oneport;
import org.activeio.packet.Packet;
diff --git a/activeio/activeio-core/src/java/org/activeio/oneport/UnknownRecognizer.java b/activeio/activeio-core/src/java/org/activeio/oneport/UnknownRecognizer.java
index 4263a4eaa3..696141a6e7 100644
--- a/activeio/activeio-core/src/java/org/activeio/oneport/UnknownRecognizer.java
+++ b/activeio/activeio-core/src/java/org/activeio/oneport/UnknownRecognizer.java
@@ -1,20 +1,19 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.oneport;
import org.activeio.packet.Packet;
diff --git a/activeio/activeio-core/src/java/org/activeio/oneport/jetty/JettyOnePortSocketListener.java b/activeio/activeio-core/src/java/org/activeio/oneport/jetty/JettyOnePortSocketListener.java
index 4cbf8993ba..f2ede1d0c6 100644
--- a/activeio/activeio-core/src/java/org/activeio/oneport/jetty/JettyOnePortSocketListener.java
+++ b/activeio/activeio-core/src/java/org/activeio/oneport/jetty/JettyOnePortSocketListener.java
@@ -1,20 +1,19 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.oneport.jetty;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/oneport/openorb/OpenORBOpenPortFeatureInitializer.java b/activeio/activeio-core/src/java/org/activeio/oneport/openorb/OpenORBOpenPortFeatureInitializer.java
index 72d3335872..cabc4aaec4 100644
--- a/activeio/activeio-core/src/java/org/activeio/oneport/openorb/OpenORBOpenPortFeatureInitializer.java
+++ b/activeio/activeio-core/src/java/org/activeio/oneport/openorb/OpenORBOpenPortFeatureInitializer.java
@@ -1,20 +1,19 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.oneport.openorb;
import org.omg.PortableInterceptor.ORBInitInfo;
diff --git a/activeio/activeio-core/src/java/org/activeio/oneport/openorb/OpenORBOpenPortSocketFactory.java b/activeio/activeio-core/src/java/org/activeio/oneport/openorb/OpenORBOpenPortSocketFactory.java
index f1a27fe2a5..7972f90901 100644
--- a/activeio/activeio-core/src/java/org/activeio/oneport/openorb/OpenORBOpenPortSocketFactory.java
+++ b/activeio/activeio-core/src/java/org/activeio/oneport/openorb/OpenORBOpenPortSocketFactory.java
@@ -1,20 +1,19 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.oneport.openorb;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/AppendedPacket.java b/activeio/activeio-core/src/java/org/activeio/packet/AppendedPacket.java
index 40c0b80335..94a358a3cc 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/AppendedPacket.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/AppendedPacket.java
@@ -1,18 +1,18 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
+ * 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.activeio.packet;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/ByteArrayPacket.java b/activeio/activeio-core/src/java/org/activeio/packet/ByteArrayPacket.java
index 6b375645c1..47642c7633 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/ByteArrayPacket.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/ByteArrayPacket.java
@@ -1,18 +1,18 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
+ * 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.activeio.packet;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/ByteBufferPacket.java b/activeio/activeio-core/src/java/org/activeio/packet/ByteBufferPacket.java
index d8a1ca4569..c9ccf254cb 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/ByteBufferPacket.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/ByteBufferPacket.java
@@ -1,18 +1,18 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
+ * 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.activeio.packet;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/ByteBufferPacketPool.java b/activeio/activeio-core/src/java/org/activeio/packet/ByteBufferPacketPool.java
index 961cf1d493..ffb21b44ac 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/ByteBufferPacketPool.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/ByteBufferPacketPool.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.activeio.packet;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/BytePacket.java b/activeio/activeio-core/src/java/org/activeio/packet/BytePacket.java
index 2daf0ef595..9103c344d6 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/BytePacket.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/BytePacket.java
@@ -1,18 +1,18 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
+ * 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.activeio.packet;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/ByteSequence.java b/activeio/activeio-core/src/java/org/activeio/packet/ByteSequence.java
index b2ecd46465..c6cc509da7 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/ByteSequence.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/ByteSequence.java
@@ -1,21 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.packet;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/EOSPacket.java b/activeio/activeio-core/src/java/org/activeio/packet/EOSPacket.java
index 6dd008c933..217602df58 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/EOSPacket.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/EOSPacket.java
@@ -1,18 +1,18 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
+ * 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.activeio.packet;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/EmptyPacket.java b/activeio/activeio-core/src/java/org/activeio/packet/EmptyPacket.java
index e3cc0a596a..72df9060a9 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/EmptyPacket.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/EmptyPacket.java
@@ -1,18 +1,18 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
+ * 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.activeio.packet;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/FilterPacket.java b/activeio/activeio-core/src/java/org/activeio/packet/FilterPacket.java
index cd2e421530..d680b0bbab 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/FilterPacket.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/FilterPacket.java
@@ -1,18 +1,18 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
+ * 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.activeio.packet;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/Packet.java b/activeio/activeio-core/src/java/org/activeio/packet/Packet.java
index d839427074..8ed60533dc 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/Packet.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/Packet.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chrino
+ * Copyright 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
+ * 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.
*/
package org.activeio.packet;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/PacketData.java b/activeio/activeio-core/src/java/org/activeio/packet/PacketData.java
index bb928f97fa..1540a50cf1 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/PacketData.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/PacketData.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.packet;
import java.io.EOFException;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/PacketPool.java b/activeio/activeio-core/src/java/org/activeio/packet/PacketPool.java
index 2b63e87a7a..1abda66940 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/PacketPool.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/PacketPool.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.activeio.packet;
import java.util.ArrayList;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/sync/FilterSyncChannel.java b/activeio/activeio-core/src/java/org/activeio/packet/sync/FilterSyncChannel.java
index 9c5a3d7839..2d045ae841 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/sync/FilterSyncChannel.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/sync/FilterSyncChannel.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio.packet.sync;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/sync/FilterSyncChannelServer.java b/activeio/activeio-core/src/java/org/activeio/packet/sync/FilterSyncChannelServer.java
index 6bd29758bc..88536cc3c8 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/sync/FilterSyncChannelServer.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/sync/FilterSyncChannelServer.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio.packet.sync;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/sync/SyncChannel.java b/activeio/activeio-core/src/java/org/activeio/packet/sync/SyncChannel.java
index 12c3dd58c8..8b8a479424 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/sync/SyncChannel.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/sync/SyncChannel.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio.packet.sync;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/sync/SyncChannelFactory.java b/activeio/activeio-core/src/java/org/activeio/packet/sync/SyncChannelFactory.java
index 7da1e22e16..7f4207a907 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/sync/SyncChannelFactory.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/sync/SyncChannelFactory.java
@@ -1,19 +1,19 @@
/**
-*
-* Copyright 2004 Hiram Chirino
-*
-* 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.
-*/
+ *
+ * Copyright 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.
+ */
package org.activeio.packet.sync;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/sync/SyncChannelServer.java b/activeio/activeio-core/src/java/org/activeio/packet/sync/SyncChannelServer.java
index b708811fb3..dfcaf2d38f 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/sync/SyncChannelServer.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/sync/SyncChannelServer.java
@@ -1,19 +1,19 @@
/**
-*
-* Copyright 2004 Hiram Chirino
-*
-* 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.
-*/
+ *
+ * Copyright 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.
+ */
package org.activeio.packet.sync;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/sync/datagram/DatagramContext.java b/activeio/activeio-core/src/java/org/activeio/packet/sync/datagram/DatagramContext.java
index bcae0a5524..95204b8e99 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/sync/datagram/DatagramContext.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/sync/datagram/DatagramContext.java
@@ -1,8 +1,18 @@
-/*
- * Created on Dec 22, 2004
+/**
*
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
+ * Copyright 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.
*/
package org.activeio.packet.sync.datagram;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/sync/datagram/DatagramSocketSyncChannel.java b/activeio/activeio-core/src/java/org/activeio/packet/sync/datagram/DatagramSocketSyncChannel.java
index 446d9b7599..72857b2b7d 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/sync/datagram/DatagramSocketSyncChannel.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/sync/datagram/DatagramSocketSyncChannel.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.packet.sync.datagram;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/sync/datagram/DatagramSocketSyncChannelFactory.java b/activeio/activeio-core/src/java/org/activeio/packet/sync/datagram/DatagramSocketSyncChannelFactory.java
index 4c60c34d45..a324a068d1 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/sync/datagram/DatagramSocketSyncChannelFactory.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/sync/datagram/DatagramSocketSyncChannelFactory.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.packet.sync.datagram;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/sync/filter/PacketAggregatingSyncChannel.java b/activeio/activeio-core/src/java/org/activeio/packet/sync/filter/PacketAggregatingSyncChannel.java
index 6314af6ca5..cc59229d5a 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/sync/filter/PacketAggregatingSyncChannel.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/sync/filter/PacketAggregatingSyncChannel.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio.packet.sync.filter;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/sync/filter/PushbackSyncChannel.java b/activeio/activeio-core/src/java/org/activeio/packet/sync/filter/PushbackSyncChannel.java
index b2d37a1a36..bdc61dc38b 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/sync/filter/PushbackSyncChannel.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/sync/filter/PushbackSyncChannel.java
@@ -1,20 +1,19 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.packet.sync.filter;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/sync/filter/SynchornizedSyncChannel.java b/activeio/activeio-core/src/java/org/activeio/packet/sync/filter/SynchornizedSyncChannel.java
index dcfa1e3cd6..1634ee00db 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/sync/filter/SynchornizedSyncChannel.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/sync/filter/SynchornizedSyncChannel.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio.packet.sync.filter;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/sync/filter/WriteBufferedSyncChannel.java b/activeio/activeio-core/src/java/org/activeio/packet/sync/filter/WriteBufferedSyncChannel.java
index ca57cf7289..8416964ad3 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/sync/filter/WriteBufferedSyncChannel.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/sync/filter/WriteBufferedSyncChannel.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio.packet.sync.filter;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/sync/jxta/JxtaSocketSyncChannelFactory.java b/activeio/activeio-core/src/java/org/activeio/packet/sync/jxta/JxtaSocketSyncChannelFactory.java
index a1a20d91b2..f4ab7c21da 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/sync/jxta/JxtaSocketSyncChannelFactory.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/sync/jxta/JxtaSocketSyncChannelFactory.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.packet.sync.jxta;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/sync/multicast/MulticastSocketSyncChannel.java b/activeio/activeio-core/src/java/org/activeio/packet/sync/multicast/MulticastSocketSyncChannel.java
index cbb80323e1..d04d8fa134 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/sync/multicast/MulticastSocketSyncChannel.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/sync/multicast/MulticastSocketSyncChannel.java
@@ -1,12 +1,12 @@
/**
*
- * Copyright 2005 (C) The original author or authors.
+ * Copyright 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
+ * 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,
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/sync/multicast/MulticastSocketSyncChannelFactory.java b/activeio/activeio-core/src/java/org/activeio/packet/sync/multicast/MulticastSocketSyncChannelFactory.java
index e46f81f654..2543fe4858 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/sync/multicast/MulticastSocketSyncChannelFactory.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/sync/multicast/MulticastSocketSyncChannelFactory.java
@@ -1,12 +1,12 @@
/**
*
- * Copyright 2005 (C) The original author or authors.
+ * Copyright 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
+ * 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,
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/sync/nio/NIOBaseChannel.java b/activeio/activeio-core/src/java/org/activeio/packet/sync/nio/NIOBaseChannel.java
index 911ae92249..d451513a2d 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/sync/nio/NIOBaseChannel.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/sync/nio/NIOBaseChannel.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.packet.sync.nio;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/sync/nio/NIOSyncChannel.java b/activeio/activeio-core/src/java/org/activeio/packet/sync/nio/NIOSyncChannel.java
index 096bd9d7cc..b82bf48190 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/sync/nio/NIOSyncChannel.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/sync/nio/NIOSyncChannel.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.packet.sync.nio;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/sync/nio/NIOSyncChannelFactory.java b/activeio/activeio-core/src/java/org/activeio/packet/sync/nio/NIOSyncChannelFactory.java
index 7616109ecc..69bc8f155c 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/sync/nio/NIOSyncChannelFactory.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/sync/nio/NIOSyncChannelFactory.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.packet.sync.nio;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/sync/nio/NIOSyncChannelServer.java b/activeio/activeio-core/src/java/org/activeio/packet/sync/nio/NIOSyncChannelServer.java
index f4d21eddc3..53fa9656c7 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/sync/nio/NIOSyncChannelServer.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/sync/nio/NIOSyncChannelServer.java
@@ -1,20 +1,19 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.packet.sync.nio;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/sync/socket/SocketSyncChannel.java b/activeio/activeio-core/src/java/org/activeio/packet/sync/socket/SocketSyncChannel.java
index 33109bccab..0c11a2e93d 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/sync/socket/SocketSyncChannel.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/sync/socket/SocketSyncChannel.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.packet.sync.socket;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/sync/socket/SocketSyncChannelFactory.java b/activeio/activeio-core/src/java/org/activeio/packet/sync/socket/SocketSyncChannelFactory.java
index 2014c7d038..c40e34679c 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/sync/socket/SocketSyncChannelFactory.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/sync/socket/SocketSyncChannelFactory.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.packet.sync.socket;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/sync/socket/SocketSyncChannelServer.java b/activeio/activeio-core/src/java/org/activeio/packet/sync/socket/SocketSyncChannelServer.java
index 3db7c959ba..2926121c71 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/sync/socket/SocketSyncChannelServer.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/sync/socket/SocketSyncChannelServer.java
@@ -1,20 +1,19 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.packet.sync.socket;
diff --git a/activeio/activeio-core/src/java/org/activeio/packet/sync/ssl/SslSocketSyncChannelFactory.java b/activeio/activeio-core/src/java/org/activeio/packet/sync/ssl/SslSocketSyncChannelFactory.java
index e8a3c706bc..70a0e43c1f 100644
--- a/activeio/activeio-core/src/java/org/activeio/packet/sync/ssl/SslSocketSyncChannelFactory.java
+++ b/activeio/activeio-core/src/java/org/activeio/packet/sync/ssl/SslSocketSyncChannelFactory.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.packet.sync.ssl;
import javax.net.ssl.SSLServerSocketFactory;
diff --git a/activeio/activeio-core/src/java/org/activeio/stream/sync/StreamChannel.java b/activeio/activeio-core/src/java/org/activeio/stream/sync/StreamChannel.java
index 3a1715cd2c..eb33547a24 100644
--- a/activeio/activeio-core/src/java/org/activeio/stream/sync/StreamChannel.java
+++ b/activeio/activeio-core/src/java/org/activeio/stream/sync/StreamChannel.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio.stream.sync;
diff --git a/activeio/activeio-core/src/java/org/activeio/stream/sync/StreamChannelFactory.java b/activeio/activeio-core/src/java/org/activeio/stream/sync/StreamChannelFactory.java
index a0717cd548..856e00008e 100644
--- a/activeio/activeio-core/src/java/org/activeio/stream/sync/StreamChannelFactory.java
+++ b/activeio/activeio-core/src/java/org/activeio/stream/sync/StreamChannelFactory.java
@@ -1,19 +1,19 @@
/**
-*
-* Copyright 2004 Hiram Chirino
-*
-* 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.
-*/
+ *
+ * Copyright 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.
+ */
package org.activeio.stream.sync;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/stream/sync/StreamChannelServer.java b/activeio/activeio-core/src/java/org/activeio/stream/sync/StreamChannelServer.java
index a32187a6a0..7b26896c58 100644
--- a/activeio/activeio-core/src/java/org/activeio/stream/sync/StreamChannelServer.java
+++ b/activeio/activeio-core/src/java/org/activeio/stream/sync/StreamChannelServer.java
@@ -1,19 +1,19 @@
/**
-*
-* Copyright 2004 Hiram Chirino
-*
-* 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.
-*/
+ *
+ * Copyright 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.
+ */
package org.activeio.stream.sync;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/stream/sync/socket/SocketStreamChannel.java b/activeio/activeio-core/src/java/org/activeio/stream/sync/socket/SocketStreamChannel.java
index 91c33fbfc4..f4beb1bc39 100644
--- a/activeio/activeio-core/src/java/org/activeio/stream/sync/socket/SocketStreamChannel.java
+++ b/activeio/activeio-core/src/java/org/activeio/stream/sync/socket/SocketStreamChannel.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.stream.sync.socket;
diff --git a/activeio/activeio-core/src/java/org/activeio/stream/sync/socket/SocketStreamChannelFactory.java b/activeio/activeio-core/src/java/org/activeio/stream/sync/socket/SocketStreamChannelFactory.java
index 7b90aa7590..fc969702a2 100644
--- a/activeio/activeio-core/src/java/org/activeio/stream/sync/socket/SocketStreamChannelFactory.java
+++ b/activeio/activeio-core/src/java/org/activeio/stream/sync/socket/SocketStreamChannelFactory.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.stream.sync.socket;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/stream/sync/socket/SocketStreamChannelServer.java b/activeio/activeio-core/src/java/org/activeio/stream/sync/socket/SocketStreamChannelServer.java
index 3f5db3d797..b628fbd81e 100644
--- a/activeio/activeio-core/src/java/org/activeio/stream/sync/socket/SocketStreamChannelServer.java
+++ b/activeio/activeio-core/src/java/org/activeio/stream/sync/socket/SocketStreamChannelServer.java
@@ -1,20 +1,19 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.stream.sync.socket;
diff --git a/activeio/activeio-core/src/java/org/activeio/util/ByteArrayInputStream.java b/activeio/activeio-core/src/java/org/activeio/util/ByteArrayInputStream.java
index f3cee96a75..ec046aa835 100644
--- a/activeio/activeio-core/src/java/org/activeio/util/ByteArrayInputStream.java
+++ b/activeio/activeio-core/src/java/org/activeio/util/ByteArrayInputStream.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activeio.util;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/java/org/activeio/util/ByteArrayOutputStream.java b/activeio/activeio-core/src/java/org/activeio/util/ByteArrayOutputStream.java
index 9281a98558..55d64fb7a1 100644
--- a/activeio/activeio-core/src/java/org/activeio/util/ByteArrayOutputStream.java
+++ b/activeio/activeio-core/src/java/org/activeio/util/ByteArrayOutputStream.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activeio.util;
import java.io.OutputStream;
diff --git a/activeio/activeio-core/src/java/org/activeio/util/FactoryFinder.java b/activeio/activeio-core/src/java/org/activeio/util/FactoryFinder.java
index 989ed92b44..e49422037b 100644
--- a/activeio/activeio-core/src/java/org/activeio/util/FactoryFinder.java
+++ b/activeio/activeio-core/src/java/org/activeio/util/FactoryFinder.java
@@ -1,5 +1,18 @@
/**
- *
+ *
+ * Copyright 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.
*/
package org.activeio.util;
diff --git a/activeio/activeio-core/src/java/org/activeio/util/PacketAggregator.java b/activeio/activeio-core/src/java/org/activeio/util/PacketAggregator.java
index 04934385c7..a1c18bbaec 100644
--- a/activeio/activeio-core/src/java/org/activeio/util/PacketAggregator.java
+++ b/activeio/activeio-core/src/java/org/activeio/util/PacketAggregator.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio.util;
diff --git a/activeio/activeio-core/src/java/org/activeio/util/URISupport.java b/activeio/activeio-core/src/java/org/activeio/util/URISupport.java
index e49f08b90d..c08a7efe1b 100644
--- a/activeio/activeio-core/src/java/org/activeio/util/URISupport.java
+++ b/activeio/activeio-core/src/java/org/activeio/util/URISupport.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio.util;
diff --git a/activeio/activeio-core/src/java/org/activeio/xnet/ServerService.java b/activeio/activeio-core/src/java/org/activeio/xnet/ServerService.java
index 517116633b..6d21afa1f6 100644
--- a/activeio/activeio-core/src/java/org/activeio/xnet/ServerService.java
+++ b/activeio/activeio-core/src/java/org/activeio/xnet/ServerService.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2005 the original author or authors.
+ * Copyright 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
+ * 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.
*/
package org.activeio.xnet;
diff --git a/activeio/activeio-core/src/java/org/activeio/xnet/ServiceDaemon.java b/activeio/activeio-core/src/java/org/activeio/xnet/ServiceDaemon.java
index e07c9387c2..a6e1c06165 100644
--- a/activeio/activeio-core/src/java/org/activeio/xnet/ServiceDaemon.java
+++ b/activeio/activeio-core/src/java/org/activeio/xnet/ServiceDaemon.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2005 the original author or authors.
+ * Copyright 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
+ * 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.
*/
package org.activeio.xnet;
diff --git a/activeio/activeio-core/src/java/org/activeio/xnet/ServiceException.java b/activeio/activeio-core/src/java/org/activeio/xnet/ServiceException.java
index 99d31457ff..2c8f03297d 100644
--- a/activeio/activeio-core/src/java/org/activeio/xnet/ServiceException.java
+++ b/activeio/activeio-core/src/java/org/activeio/xnet/ServiceException.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2005 the original author or authors.
+ * Copyright 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
+ * 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.
*/
package org.activeio.xnet;
diff --git a/activeio/activeio-core/src/java/org/activeio/xnet/ServiceLogger.java b/activeio/activeio-core/src/java/org/activeio/xnet/ServiceLogger.java
index 4ba29c73a8..1bd4f6d0b0 100644
--- a/activeio/activeio-core/src/java/org/activeio/xnet/ServiceLogger.java
+++ b/activeio/activeio-core/src/java/org/activeio/xnet/ServiceLogger.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2005 the original author or authors.
+ * Copyright 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
+ * 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.
*/
package org.activeio.xnet;
diff --git a/activeio/activeio-core/src/java/org/activeio/xnet/ServicePool.java b/activeio/activeio-core/src/java/org/activeio/xnet/ServicePool.java
index 0ebd099c03..2ffd1d47e1 100644
--- a/activeio/activeio-core/src/java/org/activeio/xnet/ServicePool.java
+++ b/activeio/activeio-core/src/java/org/activeio/xnet/ServicePool.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2005 the original author or authors.
+ * Copyright 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
+ * 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.
*/
package org.activeio.xnet;
diff --git a/activeio/activeio-core/src/java/org/activeio/xnet/SocketService.java b/activeio/activeio-core/src/java/org/activeio/xnet/SocketService.java
index cb7e6d9220..d56f82c3f5 100644
--- a/activeio/activeio-core/src/java/org/activeio/xnet/SocketService.java
+++ b/activeio/activeio-core/src/java/org/activeio/xnet/SocketService.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2005 the original author or authors.
+ * Copyright 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
+ * 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.
*/
package org.activeio.xnet;
diff --git a/activeio/activeio-core/src/java/org/activeio/xnet/StandardServiceStack.java b/activeio/activeio-core/src/java/org/activeio/xnet/StandardServiceStack.java
index 381a33928a..06a801117f 100644
--- a/activeio/activeio-core/src/java/org/activeio/xnet/StandardServiceStack.java
+++ b/activeio/activeio-core/src/java/org/activeio/xnet/StandardServiceStack.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2005 the original author or authors.
+ * Copyright 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
+ * 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.
*/
package org.activeio.xnet;
diff --git a/activeio/activeio-core/src/java/org/activeio/xnet/StandardServiceStackGBean.java b/activeio/activeio-core/src/java/org/activeio/xnet/StandardServiceStackGBean.java
index abf2099303..99fa33ce32 100644
--- a/activeio/activeio-core/src/java/org/activeio/xnet/StandardServiceStackGBean.java
+++ b/activeio/activeio-core/src/java/org/activeio/xnet/StandardServiceStackGBean.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2005 the original author or authors.
+ * Copyright 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
+ * 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.
*/
package org.activeio.xnet;
diff --git a/activeio/activeio-core/src/java/org/activeio/xnet/SyncChannelServerDaemon.java b/activeio/activeio-core/src/java/org/activeio/xnet/SyncChannelServerDaemon.java
index 853cfeb533..3bd041346a 100644
--- a/activeio/activeio-core/src/java/org/activeio/xnet/SyncChannelServerDaemon.java
+++ b/activeio/activeio-core/src/java/org/activeio/xnet/SyncChannelServerDaemon.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2005 the original author or authors.
+ * Copyright 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
+ * 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.
*/
package org.activeio.xnet;
diff --git a/activeio/activeio-core/src/java/org/activeio/xnet/hba/ExactIPAddressPermission.java b/activeio/activeio-core/src/java/org/activeio/xnet/hba/ExactIPAddressPermission.java
index 1194c90576..ab9abe50a6 100644
--- a/activeio/activeio-core/src/java/org/activeio/xnet/hba/ExactIPAddressPermission.java
+++ b/activeio/activeio-core/src/java/org/activeio/xnet/hba/ExactIPAddressPermission.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2005 Gianny Damour.
+ * Copyright 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
+ * 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.
*/
package org.activeio.xnet.hba;
diff --git a/activeio/activeio-core/src/java/org/activeio/xnet/hba/ExactIPv6AddressPermission.java b/activeio/activeio-core/src/java/org/activeio/xnet/hba/ExactIPv6AddressPermission.java
index fdd687dfcb..775477456e 100644
--- a/activeio/activeio-core/src/java/org/activeio/xnet/hba/ExactIPv6AddressPermission.java
+++ b/activeio/activeio-core/src/java/org/activeio/xnet/hba/ExactIPv6AddressPermission.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2005 Gianny Damour.
+ * Copyright 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
+ * 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.
*/
package org.activeio.xnet.hba;
diff --git a/activeio/activeio-core/src/java/org/activeio/xnet/hba/FactorizedIPAddressPermission.java b/activeio/activeio-core/src/java/org/activeio/xnet/hba/FactorizedIPAddressPermission.java
index 453a7449d7..58b1b076f2 100644
--- a/activeio/activeio-core/src/java/org/activeio/xnet/hba/FactorizedIPAddressPermission.java
+++ b/activeio/activeio-core/src/java/org/activeio/xnet/hba/FactorizedIPAddressPermission.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2005 Gianny Damour.
+ * Copyright 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
+ * 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.
*/
package org.activeio.xnet.hba;
diff --git a/activeio/activeio-core/src/java/org/activeio/xnet/hba/IPAddressPermission.java b/activeio/activeio-core/src/java/org/activeio/xnet/hba/IPAddressPermission.java
index 96f6d6daae..bfde459ad5 100644
--- a/activeio/activeio-core/src/java/org/activeio/xnet/hba/IPAddressPermission.java
+++ b/activeio/activeio-core/src/java/org/activeio/xnet/hba/IPAddressPermission.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2005 Gianny Damour.
+ * Copyright 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
+ * 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.
*/
package org.activeio.xnet.hba;
diff --git a/activeio/activeio-core/src/java/org/activeio/xnet/hba/IPAddressPermissionEditor.java b/activeio/activeio-core/src/java/org/activeio/xnet/hba/IPAddressPermissionEditor.java
index cd38d61c84..2bcf4bce19 100644
--- a/activeio/activeio-core/src/java/org/activeio/xnet/hba/IPAddressPermissionEditor.java
+++ b/activeio/activeio-core/src/java/org/activeio/xnet/hba/IPAddressPermissionEditor.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2005 Gianny Damour.
+ * Copyright 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
+ * 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.
*/
package org.activeio.xnet.hba;
diff --git a/activeio/activeio-core/src/java/org/activeio/xnet/hba/IPAddressPermissionFactory.java b/activeio/activeio-core/src/java/org/activeio/xnet/hba/IPAddressPermissionFactory.java
index 6c2e07f445..fa049a1c1c 100644
--- a/activeio/activeio-core/src/java/org/activeio/xnet/hba/IPAddressPermissionFactory.java
+++ b/activeio/activeio-core/src/java/org/activeio/xnet/hba/IPAddressPermissionFactory.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2005 Gianny Damour.
+ * Copyright 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
+ * 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.
*/
package org.activeio.xnet.hba;
diff --git a/activeio/activeio-core/src/java/org/activeio/xnet/hba/NetmaskIPAddressPermission.java b/activeio/activeio-core/src/java/org/activeio/xnet/hba/NetmaskIPAddressPermission.java
index 735776ce37..9f07a81f03 100644
--- a/activeio/activeio-core/src/java/org/activeio/xnet/hba/NetmaskIPAddressPermission.java
+++ b/activeio/activeio-core/src/java/org/activeio/xnet/hba/NetmaskIPAddressPermission.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2005 Gianny Damour.
+ * Copyright 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
+ * 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.
*/
package org.activeio.xnet.hba;
diff --git a/activeio/activeio-core/src/java/org/activeio/xnet/hba/NetmaskIPv6AddressPermission.java b/activeio/activeio-core/src/java/org/activeio/xnet/hba/NetmaskIPv6AddressPermission.java
index b19e6eb57d..44bc436dc5 100644
--- a/activeio/activeio-core/src/java/org/activeio/xnet/hba/NetmaskIPv6AddressPermission.java
+++ b/activeio/activeio-core/src/java/org/activeio/xnet/hba/NetmaskIPv6AddressPermission.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2005 Gianny Damour.
+ * Copyright 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
+ * 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.
*/
package org.activeio.xnet.hba;
diff --git a/activeio/activeio-core/src/java/org/activeio/xnet/hba/ServiceAccessController.java b/activeio/activeio-core/src/java/org/activeio/xnet/hba/ServiceAccessController.java
index 856da52344..c734f80316 100644
--- a/activeio/activeio-core/src/java/org/activeio/xnet/hba/ServiceAccessController.java
+++ b/activeio/activeio-core/src/java/org/activeio/xnet/hba/ServiceAccessController.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2005 the original author or authors.
+ * Copyright 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
+ * 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.
*/
package org.activeio.xnet.hba;
diff --git a/activeio/activeio-core/src/java/org/activeio/xnet/hba/StartWithIPAddressPermission.java b/activeio/activeio-core/src/java/org/activeio/xnet/hba/StartWithIPAddressPermission.java
index f95a78a2ab..b8052f977b 100644
--- a/activeio/activeio-core/src/java/org/activeio/xnet/hba/StartWithIPAddressPermission.java
+++ b/activeio/activeio-core/src/java/org/activeio/xnet/hba/StartWithIPAddressPermission.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2005 Gianny Damour.
+ * Copyright 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
+ * 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.
*/
package org.activeio.xnet.hba;
diff --git a/activeio/activeio-core/src/test/org/activeio/ChannelFactoryTest.java b/activeio/activeio-core/src/test/org/activeio/ChannelFactoryTest.java
index 06e6312393..30e514e0de 100644
--- a/activeio/activeio-core/src/test/org/activeio/ChannelFactoryTest.java
+++ b/activeio/activeio-core/src/test/org/activeio/ChannelFactoryTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/test/org/activeio/PacketDataTest.java b/activeio/activeio-core/src/test/org/activeio/PacketDataTest.java
index 40e2e40f22..1a61bfb5b7 100644
--- a/activeio/activeio-core/src/test/org/activeio/PacketDataTest.java
+++ b/activeio/activeio-core/src/test/org/activeio/PacketDataTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/test/org/activeio/journal/JournalPerfToolSupport.java b/activeio/activeio-core/src/test/org/activeio/journal/JournalPerfToolSupport.java
index a4e6d0b0bf..9621ba5de8 100644
--- a/activeio/activeio-core/src/test/org/activeio/journal/JournalPerfToolSupport.java
+++ b/activeio/activeio-core/src/test/org/activeio/journal/JournalPerfToolSupport.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.journal;
import java.io.File;
diff --git a/activeio/activeio-core/src/test/org/activeio/journal/JournalStatsFilter.java b/activeio/activeio-core/src/test/org/activeio/journal/JournalStatsFilter.java
index 11c332452b..761e88650c 100644
--- a/activeio/activeio-core/src/test/org/activeio/journal/JournalStatsFilter.java
+++ b/activeio/activeio-core/src/test/org/activeio/journal/JournalStatsFilter.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.activeio.journal;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/test/org/activeio/journal/active/DataStruturesTest.java b/activeio/activeio-core/src/test/org/activeio/journal/active/DataStruturesTest.java
index fc1b2e66a2..4650d4934c 100644
--- a/activeio/activeio-core/src/test/org/activeio/journal/active/DataStruturesTest.java
+++ b/activeio/activeio-core/src/test/org/activeio/journal/active/DataStruturesTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.journal.active;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/test/org/activeio/journal/active/JournalImplTest.java b/activeio/activeio-core/src/test/org/activeio/journal/active/JournalImplTest.java
index b39583d5a0..124dbabd5f 100644
--- a/activeio/activeio-core/src/test/org/activeio/journal/active/JournalImplTest.java
+++ b/activeio/activeio-core/src/test/org/activeio/journal/active/JournalImplTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.journal.active;
import java.io.File;
diff --git a/activeio/activeio-core/src/test/org/activeio/journal/active/JournalPerfTool.java b/activeio/activeio-core/src/test/org/activeio/journal/active/JournalPerfTool.java
index 74fe0399ab..f858b9017e 100644
--- a/activeio/activeio-core/src/test/org/activeio/journal/active/JournalPerfTool.java
+++ b/activeio/activeio-core/src/test/org/activeio/journal/active/JournalPerfTool.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.journal.active;
import java.io.File;
diff --git a/activeio/activeio-core/src/test/org/activeio/journal/active/LogFileManagerTest.java b/activeio/activeio-core/src/test/org/activeio/journal/active/LogFileManagerTest.java
index 32662f8a23..b9b6abc20f 100644
--- a/activeio/activeio-core/src/test/org/activeio/journal/active/LogFileManagerTest.java
+++ b/activeio/activeio-core/src/test/org/activeio/journal/active/LogFileManagerTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.journal.active;
import java.io.File;
diff --git a/activeio/activeio-core/src/test/org/activeio/journal/howl/JournalPerfTool.java b/activeio/activeio-core/src/test/org/activeio/journal/howl/JournalPerfTool.java
index c49e979a21..5f9a557be7 100644
--- a/activeio/activeio-core/src/test/org/activeio/journal/howl/JournalPerfTool.java
+++ b/activeio/activeio-core/src/test/org/activeio/journal/howl/JournalPerfTool.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.journal.howl;
import java.io.File;
diff --git a/activeio/activeio-core/src/test/org/activeio/oneport/OnePortAsyncChannelServerTest.java b/activeio/activeio-core/src/test/org/activeio/oneport/OnePortAsyncChannelServerTest.java
index aedd5a9338..bfab2c60bf 100644
--- a/activeio/activeio-core/src/test/org/activeio/oneport/OnePortAsyncChannelServerTest.java
+++ b/activeio/activeio-core/src/test/org/activeio/oneport/OnePortAsyncChannelServerTest.java
@@ -1,20 +1,19 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.oneport;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/test/org/activeio/oneport/jetty/JettyOnePortSocketListenerTest.java b/activeio/activeio-core/src/test/org/activeio/oneport/jetty/JettyOnePortSocketListenerTest.java
index dd27b6061d..33ff899cda 100644
--- a/activeio/activeio-core/src/test/org/activeio/oneport/jetty/JettyOnePortSocketListenerTest.java
+++ b/activeio/activeio-core/src/test/org/activeio/oneport/jetty/JettyOnePortSocketListenerTest.java
@@ -1,20 +1,19 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.oneport.jetty;
import org.activeio.oneport.OnePortAsyncChannelServerTest;
diff --git a/activeio/activeio-core/src/test/org/activeio/oneport/jetty/TestServlet.java b/activeio/activeio-core/src/test/org/activeio/oneport/jetty/TestServlet.java
index a72c609ee9..5038601432 100644
--- a/activeio/activeio-core/src/test/org/activeio/oneport/jetty/TestServlet.java
+++ b/activeio/activeio-core/src/test/org/activeio/oneport/jetty/TestServlet.java
@@ -1,20 +1,19 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.oneport.jetty;
import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
diff --git a/activeio/activeio-core/src/test/org/activeio/oneport/openorb/OpenORBOnePortSocketFactoryTest.java b/activeio/activeio-core/src/test/org/activeio/oneport/openorb/OpenORBOnePortSocketFactoryTest.java
index b43ff9a1e0..303e6063d6 100644
--- a/activeio/activeio-core/src/test/org/activeio/oneport/openorb/OpenORBOnePortSocketFactoryTest.java
+++ b/activeio/activeio-core/src/test/org/activeio/oneport/openorb/OpenORBOnePortSocketFactoryTest.java
@@ -1,20 +1,19 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.oneport.openorb;
import java.rmi.RemoteException;
diff --git a/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServer.java b/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServer.java
index df965b1f06..69af75ae14 100644
--- a/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServer.java
+++ b/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServer.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activeio.oneport.openorb;
/**
diff --git a/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServerHelper.java b/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServerHelper.java
index 23e1eae3ad..3ae705c3aa 100644
--- a/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServerHelper.java
+++ b/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServerHelper.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activeio.oneport.openorb;
diff --git a/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServerHolder.java b/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServerHolder.java
index 352a5bea51..4d3f342357 100644
--- a/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServerHolder.java
+++ b/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServerHolder.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activeio.oneport.openorb;
/**
diff --git a/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServerImpl.java b/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServerImpl.java
index db5f25339d..3d21c5d7dd 100644
--- a/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServerImpl.java
+++ b/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServerImpl.java
@@ -1,20 +1,20 @@
+
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.oneport.openorb;
import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
diff --git a/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServerOperations.java b/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServerOperations.java
index bf78ad5a49..aab679e4ca 100644
--- a/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServerOperations.java
+++ b/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServerOperations.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activeio.oneport.openorb;
/**
diff --git a/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServerPOA.java b/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServerPOA.java
index 0e04272ac8..458d3aeeae 100644
--- a/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServerPOA.java
+++ b/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServerPOA.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activeio.oneport.openorb;
/**
diff --git a/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServerPOATie.java b/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServerPOATie.java
index e70c89488d..5a04eeaaf8 100644
--- a/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServerPOATie.java
+++ b/activeio/activeio-core/src/test/org/activeio/oneport/openorb/TestIIOPServerPOATie.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activeio.oneport.openorb;
/**
diff --git a/activeio/activeio-core/src/test/org/activeio/oneport/openorb/_TestIIOPServerStub.java b/activeio/activeio-core/src/test/org/activeio/oneport/openorb/_TestIIOPServerStub.java
index b1768b0dbf..8023840c44 100644
--- a/activeio/activeio-core/src/test/org/activeio/oneport/openorb/_TestIIOPServerStub.java
+++ b/activeio/activeio-core/src/test/org/activeio/oneport/openorb/_TestIIOPServerStub.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activeio.oneport.openorb;
diff --git a/activeio/activeio-core/src/test/org/activeio/packet/AppendedPacketTest.java b/activeio/activeio-core/src/test/org/activeio/packet/AppendedPacketTest.java
index 2921c4e819..5c7036b2f5 100644
--- a/activeio/activeio-core/src/test/org/activeio/packet/AppendedPacketTest.java
+++ b/activeio/activeio-core/src/test/org/activeio/packet/AppendedPacketTest.java
@@ -1,18 +1,18 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
+ * 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.activeio.packet;
diff --git a/activeio/activeio-core/src/test/org/activeio/packet/ByteArrayPacketTest.java b/activeio/activeio-core/src/test/org/activeio/packet/ByteArrayPacketTest.java
index 2d22780ccd..eae5573d3a 100644
--- a/activeio/activeio-core/src/test/org/activeio/packet/ByteArrayPacketTest.java
+++ b/activeio/activeio-core/src/test/org/activeio/packet/ByteArrayPacketTest.java
@@ -1,18 +1,18 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
+ * 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.activeio.packet;
diff --git a/activeio/activeio-core/src/test/org/activeio/packet/ByteBufferPacketTest.java b/activeio/activeio-core/src/test/org/activeio/packet/ByteBufferPacketTest.java
index 8afa75d0b3..3f599b0678 100644
--- a/activeio/activeio-core/src/test/org/activeio/packet/ByteBufferPacketTest.java
+++ b/activeio/activeio-core/src/test/org/activeio/packet/ByteBufferPacketTest.java
@@ -1,18 +1,18 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
+ * 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.activeio.packet;
diff --git a/activeio/activeio-core/src/test/org/activeio/packet/ClientLoadSimulator.java b/activeio/activeio-core/src/test/org/activeio/packet/ClientLoadSimulator.java
index 7c5e24e7d2..af530610e2 100644
--- a/activeio/activeio-core/src/test/org/activeio/packet/ClientLoadSimulator.java
+++ b/activeio/activeio-core/src/test/org/activeio/packet/ClientLoadSimulator.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio.packet;
diff --git a/activeio/activeio-core/src/test/org/activeio/packet/PacketTestSupport.java b/activeio/activeio-core/src/test/org/activeio/packet/PacketTestSupport.java
index ae8357489e..1a0f1b8ab4 100644
--- a/activeio/activeio-core/src/test/org/activeio/packet/PacketTestSupport.java
+++ b/activeio/activeio-core/src/test/org/activeio/packet/PacketTestSupport.java
@@ -1,18 +1,18 @@
/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+ *
+ * Copyright 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.
+ * 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.activeio.packet;
diff --git a/activeio/activeio-core/src/test/org/activeio/packet/Server.java b/activeio/activeio-core/src/test/org/activeio/packet/Server.java
index a2e2f21e90..febdb1da8a 100644
--- a/activeio/activeio-core/src/test/org/activeio/packet/Server.java
+++ b/activeio/activeio-core/src/test/org/activeio/packet/Server.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio.packet;
diff --git a/activeio/activeio-core/src/test/org/activeio/packet/async/nio/NIOAsyncChannelTest.java b/activeio/activeio-core/src/test/org/activeio/packet/async/nio/NIOAsyncChannelTest.java
index a9a215e82e..28f2d56247 100644
--- a/activeio/activeio-core/src/test/org/activeio/packet/async/nio/NIOAsyncChannelTest.java
+++ b/activeio/activeio-core/src/test/org/activeio/packet/async/nio/NIOAsyncChannelTest.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio.packet.async.nio;
diff --git a/activeio/activeio-core/src/test/org/activeio/packet/async/vmpipe/VMPipeAsyncChannelTest.java b/activeio/activeio-core/src/test/org/activeio/packet/async/vmpipe/VMPipeAsyncChannelTest.java
index 22f0946c5f..23552516fc 100644
--- a/activeio/activeio-core/src/test/org/activeio/packet/async/vmpipe/VMPipeAsyncChannelTest.java
+++ b/activeio/activeio-core/src/test/org/activeio/packet/async/vmpipe/VMPipeAsyncChannelTest.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio.packet.async.vmpipe;
diff --git a/activeio/activeio-core/src/test/org/activeio/packet/async/vmpipe/VMPipeReflectionAsyncChannelTest.java b/activeio/activeio-core/src/test/org/activeio/packet/async/vmpipe/VMPipeReflectionAsyncChannelTest.java
index 3e3d9901de..3c9d13672d 100644
--- a/activeio/activeio-core/src/test/org/activeio/packet/async/vmpipe/VMPipeReflectionAsyncChannelTest.java
+++ b/activeio/activeio-core/src/test/org/activeio/packet/async/vmpipe/VMPipeReflectionAsyncChannelTest.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio.packet.async.vmpipe;
diff --git a/activeio/activeio-core/src/test/org/activeio/packet/nio/NIOSyncChannelTest.java b/activeio/activeio-core/src/test/org/activeio/packet/nio/NIOSyncChannelTest.java
index 8f03c3217b..7cb8955c72 100644
--- a/activeio/activeio-core/src/test/org/activeio/packet/nio/NIOSyncChannelTest.java
+++ b/activeio/activeio-core/src/test/org/activeio/packet/nio/NIOSyncChannelTest.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio.packet.nio;
diff --git a/activeio/activeio-core/src/test/org/activeio/packet/sync/ConnectionlessSyncChannelTestSupport.java b/activeio/activeio-core/src/test/org/activeio/packet/sync/ConnectionlessSyncChannelTestSupport.java
index 1196873e92..64cd840c0c 100644
--- a/activeio/activeio-core/src/test/org/activeio/packet/sync/ConnectionlessSyncChannelTestSupport.java
+++ b/activeio/activeio-core/src/test/org/activeio/packet/sync/ConnectionlessSyncChannelTestSupport.java
@@ -1,12 +1,12 @@
/**
*
- * Copyright 2005 (C) The original author or authors.
+ * Copyright 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
+ * 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,
diff --git a/activeio/activeio-core/src/test/org/activeio/packet/sync/SlowWriteSyncChannelFactory.java b/activeio/activeio-core/src/test/org/activeio/packet/sync/SlowWriteSyncChannelFactory.java
index 4412745d08..7072de1045 100644
--- a/activeio/activeio-core/src/test/org/activeio/packet/sync/SlowWriteSyncChannelFactory.java
+++ b/activeio/activeio-core/src/test/org/activeio/packet/sync/SlowWriteSyncChannelFactory.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.packet.sync;
import java.io.IOException;
diff --git a/activeio/activeio-core/src/test/org/activeio/packet/sync/SyncChannelTestSupport.java b/activeio/activeio-core/src/test/org/activeio/packet/sync/SyncChannelTestSupport.java
index 121f3c4341..bae89b4fee 100644
--- a/activeio/activeio-core/src/test/org/activeio/packet/sync/SyncChannelTestSupport.java
+++ b/activeio/activeio-core/src/test/org/activeio/packet/sync/SyncChannelTestSupport.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio.packet.sync;
diff --git a/activeio/activeio-core/src/test/org/activeio/packet/sync/datagram/DatagramSyncChannelTest.java b/activeio/activeio-core/src/test/org/activeio/packet/sync/datagram/DatagramSyncChannelTest.java
index 29ec233445..4d4eae4062 100644
--- a/activeio/activeio-core/src/test/org/activeio/packet/sync/datagram/DatagramSyncChannelTest.java
+++ b/activeio/activeio-core/src/test/org/activeio/packet/sync/datagram/DatagramSyncChannelTest.java
@@ -1,12 +1,12 @@
/**
*
- * Copyright 2005 (C) The original author or authors.
+ * Copyright 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
+ * 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,
diff --git a/activeio/activeio-core/src/test/org/activeio/packet/sync/multicast/MulticastSyncChannelTest.java b/activeio/activeio-core/src/test/org/activeio/packet/sync/multicast/MulticastSyncChannelTest.java
index d090015b77..f6d8ba3619 100644
--- a/activeio/activeio-core/src/test/org/activeio/packet/sync/multicast/MulticastSyncChannelTest.java
+++ b/activeio/activeio-core/src/test/org/activeio/packet/sync/multicast/MulticastSyncChannelTest.java
@@ -1,12 +1,12 @@
/**
*
- * Copyright 2005 (C) The original author or authors.
+ * Copyright 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
+ * 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,
diff --git a/activeio/activeio-core/src/test/org/activeio/packet/sync/socket/SlowSocketChannelSyncChannelTest.java b/activeio/activeio-core/src/test/org/activeio/packet/sync/socket/SlowSocketChannelSyncChannelTest.java
index 48b0c4593c..48983d4f8b 100644
--- a/activeio/activeio-core/src/test/org/activeio/packet/sync/socket/SlowSocketChannelSyncChannelTest.java
+++ b/activeio/activeio-core/src/test/org/activeio/packet/sync/socket/SlowSocketChannelSyncChannelTest.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio.packet.sync.socket;
diff --git a/activeio/activeio-core/src/test/org/activeio/packet/sync/socket/SlowSocketSyncChannelTest.java b/activeio/activeio-core/src/test/org/activeio/packet/sync/socket/SlowSocketSyncChannelTest.java
index 74ceefcf76..2bd04c7fef 100644
--- a/activeio/activeio-core/src/test/org/activeio/packet/sync/socket/SlowSocketSyncChannelTest.java
+++ b/activeio/activeio-core/src/test/org/activeio/packet/sync/socket/SlowSocketSyncChannelTest.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio.packet.sync.socket;
diff --git a/activeio/activeio-core/src/test/org/activeio/packet/sync/socket/SocketSyncChannelTest.java b/activeio/activeio-core/src/test/org/activeio/packet/sync/socket/SocketSyncChannelTest.java
index e72cb08a7d..2ccf753023 100644
--- a/activeio/activeio-core/src/test/org/activeio/packet/sync/socket/SocketSyncChannelTest.java
+++ b/activeio/activeio-core/src/test/org/activeio/packet/sync/socket/SocketSyncChannelTest.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio.packet.sync.socket;
diff --git a/activeio/activeio-core/src/test/org/activeio/packet/sync/ssl/SslSocketSynchChannelTest.java b/activeio/activeio-core/src/test/org/activeio/packet/sync/ssl/SslSocketSynchChannelTest.java
index c9f363555a..7008c62fca 100644
--- a/activeio/activeio-core/src/test/org/activeio/packet/sync/ssl/SslSocketSynchChannelTest.java
+++ b/activeio/activeio-core/src/test/org/activeio/packet/sync/ssl/SslSocketSynchChannelTest.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activeio.packet.sync.ssl;
diff --git a/activeio/activeio-core/src/test/org/activeio/stats/CountStatisticImpl.java b/activeio/activeio-core/src/test/org/activeio/stats/CountStatisticImpl.java
index 7f254dbed5..97fb6bf647 100644
--- a/activeio/activeio-core/src/test/org/activeio/stats/CountStatisticImpl.java
+++ b/activeio/activeio-core/src/test/org/activeio/stats/CountStatisticImpl.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.stats;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong;
diff --git a/activeio/activeio-core/src/test/org/activeio/stats/IndentPrinter.java b/activeio/activeio-core/src/test/org/activeio/stats/IndentPrinter.java
index dc830bfb4c..13175c5bd0 100644
--- a/activeio/activeio-core/src/test/org/activeio/stats/IndentPrinter.java
+++ b/activeio/activeio-core/src/test/org/activeio/stats/IndentPrinter.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.stats;
import java.io.PrintWriter;
diff --git a/activeio/activeio-core/src/test/org/activeio/stats/StatisticImpl.java b/activeio/activeio-core/src/test/org/activeio/stats/StatisticImpl.java
index a6f4aeadb5..26f3f46fe1 100644
--- a/activeio/activeio-core/src/test/org/activeio/stats/StatisticImpl.java
+++ b/activeio/activeio-core/src/test/org/activeio/stats/StatisticImpl.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.stats;
import javax.management.j2ee.statistics.Statistic;
diff --git a/activeio/activeio-core/src/test/org/activeio/stats/TimeStatisticImpl.java b/activeio/activeio-core/src/test/org/activeio/stats/TimeStatisticImpl.java
index 7f5f2e6dbb..5668cd3368 100644
--- a/activeio/activeio-core/src/test/org/activeio/stats/TimeStatisticImpl.java
+++ b/activeio/activeio-core/src/test/org/activeio/stats/TimeStatisticImpl.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activeio.stats;
import javax.management.j2ee.statistics.TimeStatistic;
diff --git a/activeio/activeio-core/src/test/org/activeio/xnet/hba/ServiceAccessControllerTest.java b/activeio/activeio-core/src/test/org/activeio/xnet/hba/ServiceAccessControllerTest.java
index f76c5f14e8..cd4c2a384c 100755
--- a/activeio/activeio-core/src/test/org/activeio/xnet/hba/ServiceAccessControllerTest.java
+++ b/activeio/activeio-core/src/test/org/activeio/xnet/hba/ServiceAccessControllerTest.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2005 Gianny Damour.
+ * Copyright 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
+ * 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.
*/
package org.activeio.xnet.hba;
diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQConnectionConsumer.java b/activemq-core/src/main/java/org/activemq/ActiveMQConnectionConsumer.java
index 4209f79397..18cf87f480 100755
--- a/activemq-core/src/main/java/org/activemq/ActiveMQConnectionConsumer.java
+++ b/activemq-core/src/main/java/org/activemq/ActiveMQConnectionConsumer.java
@@ -1,21 +1,20 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
+
package org.activemq;
import java.util.Collections;
diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQConnectionFactory.java b/activemq-core/src/main/java/org/activemq/ActiveMQConnectionFactory.java
index d793ecc8a3..7c0fd1811f 100755
--- a/activemq-core/src/main/java/org/activemq/ActiveMQConnectionFactory.java
+++ b/activemq-core/src/main/java/org/activemq/ActiveMQConnectionFactory.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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;
import java.net.URI;
diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQConnectionMetaData.java b/activemq-core/src/main/java/org/activemq/ActiveMQConnectionMetaData.java
index b7b8fe3b08..76a9b3c4e8 100755
--- a/activemq-core/src/main/java/org/activemq/ActiveMQConnectionMetaData.java
+++ b/activemq-core/src/main/java/org/activemq/ActiveMQConnectionMetaData.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import java.util.Enumeration;
diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQDispatcher.java b/activemq-core/src/main/java/org/activemq/ActiveMQDispatcher.java
index 2ceff51a18..2a638edd83 100755
--- a/activemq-core/src/main/java/org/activemq/ActiveMQDispatcher.java
+++ b/activemq-core/src/main/java/org/activemq/ActiveMQDispatcher.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import org.activemq.command.MessageDispatch;
diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQInputStream.java b/activemq-core/src/main/java/org/activemq/ActiveMQInputStream.java
index 9d33358bae..4824400f58 100644
--- a/activemq-core/src/main/java/org/activemq/ActiveMQInputStream.java
+++ b/activemq-core/src/main/java/org/activemq/ActiveMQInputStream.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 5 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQMessageConsumer.java b/activemq-core/src/main/java/org/activemq/ActiveMQMessageConsumer.java
index 6b59dfd4b9..4b4a23dcf9 100755
--- a/activemq-core/src/main/java/org/activemq/ActiveMQMessageConsumer.java
+++ b/activemq-core/src/main/java/org/activemq/ActiveMQMessageConsumer.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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;
import java.util.HashMap;
diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQMessageProducer.java b/activemq-core/src/main/java/org/activemq/ActiveMQMessageProducer.java
index e3906626e9..d9b37c70f1 100755
--- a/activemq-core/src/main/java/org/activemq/ActiveMQMessageProducer.java
+++ b/activemq-core/src/main/java/org/activemq/ActiveMQMessageProducer.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.DeliveryMode;
diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQMessageTransformation.java b/activemq-core/src/main/java/org/activemq/ActiveMQMessageTransformation.java
index 14c94143ba..56fed914cb 100755
--- a/activemq-core/src/main/java/org/activemq/ActiveMQMessageTransformation.java
+++ b/activemq-core/src/main/java/org/activemq/ActiveMQMessageTransformation.java
@@ -1,22 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
-
+ *
+ * Copyright 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.
+ */
package org.activemq;
import java.util.Enumeration;
diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQOutputStream.java b/activemq-core/src/main/java/org/activemq/ActiveMQOutputStream.java
index 9d37e95f82..e541bd58fe 100644
--- a/activemq-core/src/main/java/org/activemq/ActiveMQOutputStream.java
+++ b/activemq-core/src/main/java/org/activemq/ActiveMQOutputStream.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQPrefetchPolicy.java b/activemq-core/src/main/java/org/activemq/ActiveMQPrefetchPolicy.java
index 22bf1ec95b..9f17b4e993 100755
--- a/activemq-core/src/main/java/org/activemq/ActiveMQPrefetchPolicy.java
+++ b/activemq-core/src/main/java/org/activemq/ActiveMQPrefetchPolicy.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQQueueBrowser.java b/activemq-core/src/main/java/org/activemq/ActiveMQQueueBrowser.java
index 673f54dcd3..0beeaac5e5 100755
--- a/activemq-core/src/main/java/org/activemq/ActiveMQQueueBrowser.java
+++ b/activemq-core/src/main/java/org/activemq/ActiveMQQueueBrowser.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import java.util.Enumeration;
diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQQueueReceiver.java b/activemq-core/src/main/java/org/activemq/ActiveMQQueueReceiver.java
index c4428f0052..456f1a4235 100755
--- a/activemq-core/src/main/java/org/activemq/ActiveMQQueueReceiver.java
+++ b/activemq-core/src/main/java/org/activemq/ActiveMQQueueReceiver.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import org.activemq.command.ActiveMQDestination;
diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQQueueSender.java b/activemq-core/src/main/java/org/activemq/ActiveMQQueueSender.java
index 67eaa2bfc2..202ae3f632 100755
--- a/activemq-core/src/main/java/org/activemq/ActiveMQQueueSender.java
+++ b/activemq-core/src/main/java/org/activemq/ActiveMQQueueSender.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQQueueSession.java b/activemq-core/src/main/java/org/activemq/ActiveMQQueueSession.java
index 51fd6a6b82..df645bd471 100755
--- a/activemq-core/src/main/java/org/activemq/ActiveMQQueueSession.java
+++ b/activemq-core/src/main/java/org/activemq/ActiveMQQueueSession.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import java.io.Serializable;
diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQSession.java b/activemq-core/src/main/java/org/activemq/ActiveMQSession.java
index a7d6d2cdd4..fd30c7f9ab 100755
--- a/activemq-core/src/main/java/org/activemq/ActiveMQSession.java
+++ b/activemq-core/src/main/java/org/activemq/ActiveMQSession.java
@@ -1,22 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
-
+ *
+ * Copyright 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.
+ */
package org.activemq;
import java.io.Serializable;
diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQSessionExecutor.java b/activemq-core/src/main/java/org/activemq/ActiveMQSessionExecutor.java
index 657a12fe06..15e95fe98c 100755
--- a/activemq-core/src/main/java/org/activemq/ActiveMQSessionExecutor.java
+++ b/activemq-core/src/main/java/org/activemq/ActiveMQSessionExecutor.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQTopicPublisher.java b/activemq-core/src/main/java/org/activemq/ActiveMQTopicPublisher.java
index 1d25ba7c1b..b5024d7822 100755
--- a/activemq-core/src/main/java/org/activemq/ActiveMQTopicPublisher.java
+++ b/activemq-core/src/main/java/org/activemq/ActiveMQTopicPublisher.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQTopicSession.java b/activemq-core/src/main/java/org/activemq/ActiveMQTopicSession.java
index 99876b4038..b6145df2b7 100755
--- a/activemq-core/src/main/java/org/activemq/ActiveMQTopicSession.java
+++ b/activemq-core/src/main/java/org/activemq/ActiveMQTopicSession.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import java.io.Serializable;
diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQTopicSubscriber.java b/activemq-core/src/main/java/org/activemq/ActiveMQTopicSubscriber.java
index 188f12e431..f575576156 100755
--- a/activemq-core/src/main/java/org/activemq/ActiveMQTopicSubscriber.java
+++ b/activemq-core/src/main/java/org/activemq/ActiveMQTopicSubscriber.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQXAConnection.java b/activemq-core/src/main/java/org/activemq/ActiveMQXAConnection.java
index b00d68bdcc..635c694822 100755
--- a/activemq-core/src/main/java/org/activemq/ActiveMQXAConnection.java
+++ b/activemq-core/src/main/java/org/activemq/ActiveMQXAConnection.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.JMSException;
diff --git a/activemq-core/src/main/java/org/activemq/ActiveMQXASession.java b/activemq-core/src/main/java/org/activemq/ActiveMQXASession.java
index 728e938817..a1f3f8d934 100755
--- a/activemq-core/src/main/java/org/activemq/ActiveMQXASession.java
+++ b/activemq-core/src/main/java/org/activemq/ActiveMQXASession.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
diff --git a/activemq-core/src/main/java/org/activemq/AdvisoryConsumer.java b/activemq-core/src/main/java/org/activemq/AdvisoryConsumer.java
index 44472b3aaf..fe06597f02 100755
--- a/activemq-core/src/main/java/org/activemq/AdvisoryConsumer.java
+++ b/activemq-core/src/main/java/org/activemq/AdvisoryConsumer.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.JMSException;
diff --git a/activemq-core/src/main/java/org/activemq/AlreadyClosedException.java b/activemq-core/src/main/java/org/activemq/AlreadyClosedException.java
index bf2bccec30..fa47d3e13c 100755
--- a/activemq-core/src/main/java/org/activemq/AlreadyClosedException.java
+++ b/activemq-core/src/main/java/org/activemq/AlreadyClosedException.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.JMSException;
diff --git a/activemq-core/src/main/java/org/activemq/Closeable.java b/activemq-core/src/main/java/org/activemq/Closeable.java
index 85d41c3234..361b98720e 100755
--- a/activemq-core/src/main/java/org/activemq/Closeable.java
+++ b/activemq-core/src/main/java/org/activemq/Closeable.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.JMSException;
diff --git a/activemq-core/src/main/java/org/activemq/ConfigurationException.java b/activemq-core/src/main/java/org/activemq/ConfigurationException.java
index b81a2c9912..7486a5c2eb 100755
--- a/activemq-core/src/main/java/org/activemq/ConfigurationException.java
+++ b/activemq-core/src/main/java/org/activemq/ConfigurationException.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.JMSException;
diff --git a/activemq-core/src/main/java/org/activemq/ConnectionClosedException.java b/activemq-core/src/main/java/org/activemq/ConnectionClosedException.java
index 6aec83c2c3..423bb5dc7c 100755
--- a/activemq-core/src/main/java/org/activemq/ConnectionClosedException.java
+++ b/activemq-core/src/main/java/org/activemq/ConnectionClosedException.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.IllegalStateException;
diff --git a/activemq-core/src/main/java/org/activemq/ConnectionFailedException.java b/activemq-core/src/main/java/org/activemq/ConnectionFailedException.java
index 8542cbb062..f3a0f55f10 100755
--- a/activemq-core/src/main/java/org/activemq/ConnectionFailedException.java
+++ b/activemq-core/src/main/java/org/activemq/ConnectionFailedException.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/LocalTransactionEventListener.java b/activemq-core/src/main/java/org/activemq/LocalTransactionEventListener.java
index 7550481938..9adb3a3dc4 100755
--- a/activemq-core/src/main/java/org/activemq/LocalTransactionEventListener.java
+++ b/activemq-core/src/main/java/org/activemq/LocalTransactionEventListener.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
diff --git a/activemq-core/src/main/java/org/activemq/MessageAvailableConsumer.java b/activemq-core/src/main/java/org/activemq/MessageAvailableConsumer.java
index b6af75f1f1..29b9943923 100644
--- a/activemq-core/src/main/java/org/activemq/MessageAvailableConsumer.java
+++ b/activemq-core/src/main/java/org/activemq/MessageAvailableConsumer.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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;
import javax.jms.MessageConsumer;
diff --git a/activemq-core/src/main/java/org/activemq/MessageAvailableListener.java b/activemq-core/src/main/java/org/activemq/MessageAvailableListener.java
index 60df47ffaa..2a92f30053 100644
--- a/activemq-core/src/main/java/org/activemq/MessageAvailableListener.java
+++ b/activemq-core/src/main/java/org/activemq/MessageAvailableListener.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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;
import javax.jms.MessageConsumer;
diff --git a/activemq-core/src/main/java/org/activemq/MessageDispatchChannel.java b/activemq-core/src/main/java/org/activemq/MessageDispatchChannel.java
index 51e8d231de..db74d2c19b 100755
--- a/activemq-core/src/main/java/org/activemq/MessageDispatchChannel.java
+++ b/activemq-core/src/main/java/org/activemq/MessageDispatchChannel.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import java.util.ArrayList;
diff --git a/activemq-core/src/main/java/org/activemq/NotStartedException.java b/activemq-core/src/main/java/org/activemq/NotStartedException.java
index 754863bb70..778a9b812d 100755
--- a/activemq-core/src/main/java/org/activemq/NotStartedException.java
+++ b/activemq-core/src/main/java/org/activemq/NotStartedException.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.IllegalStateException;
diff --git a/activemq-core/src/main/java/org/activemq/Service.java b/activemq-core/src/main/java/org/activemq/Service.java
index 84ac007aa2..449d040f64 100644
--- a/activemq-core/src/main/java/org/activemq/Service.java
+++ b/activemq-core/src/main/java/org/activemq/Service.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
diff --git a/activemq-core/src/main/java/org/activemq/StreamConnection.java b/activemq-core/src/main/java/org/activemq/StreamConnection.java
index 114f4ef82c..49d218d201 100644
--- a/activemq-core/src/main/java/org/activemq/StreamConnection.java
+++ b/activemq-core/src/main/java/org/activemq/StreamConnection.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import java.io.InputStream;
diff --git a/activemq-core/src/main/java/org/activemq/ThreadPriorities.java b/activemq-core/src/main/java/org/activemq/ThreadPriorities.java
index 66caf9e07c..23ffc585fe 100755
--- a/activemq-core/src/main/java/org/activemq/ThreadPriorities.java
+++ b/activemq-core/src/main/java/org/activemq/ThreadPriorities.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) Simula Labs.
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
diff --git a/activemq-core/src/main/java/org/activemq/TransactionContext.java b/activemq-core/src/main/java/org/activemq/TransactionContext.java
index df9efe7012..eb45516419 100755
--- a/activemq-core/src/main/java/org/activemq/TransactionContext.java
+++ b/activemq-core/src/main/java/org/activemq/TransactionContext.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import java.util.ArrayList;
diff --git a/activemq-core/src/main/java/org/activemq/advisory/AdvisoryBroker.java b/activemq-core/src/main/java/org/activemq/advisory/AdvisoryBroker.java
index b7e29353a5..2bca28d2bb 100755
--- a/activemq-core/src/main/java/org/activemq/advisory/AdvisoryBroker.java
+++ b/activemq-core/src/main/java/org/activemq/advisory/AdvisoryBroker.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.advisory;
import java.util.Iterator;
diff --git a/activemq-core/src/main/java/org/activemq/advisory/AdvisorySupport.java b/activemq-core/src/main/java/org/activemq/advisory/AdvisorySupport.java
index b9fb29a10c..b94adfaeb2 100755
--- a/activemq-core/src/main/java/org/activemq/advisory/AdvisorySupport.java
+++ b/activemq-core/src/main/java/org/activemq/advisory/AdvisorySupport.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.advisory;
import org.activemq.command.ActiveMQDestination;
diff --git a/activemq-core/src/main/java/org/activemq/advisory/ConsumerEvent.java b/activemq-core/src/main/java/org/activemq/advisory/ConsumerEvent.java
index 73b5931504..10cb67c75b 100644
--- a/activemq-core/src/main/java/org/activemq/advisory/ConsumerEvent.java
+++ b/activemq-core/src/main/java/org/activemq/advisory/ConsumerEvent.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.advisory;
import org.activemq.command.ConsumerId;
diff --git a/activemq-core/src/main/java/org/activemq/advisory/ConsumerEventSource.java b/activemq-core/src/main/java/org/activemq/advisory/ConsumerEventSource.java
index 99e60ed7c3..40b19dc2cd 100644
--- a/activemq-core/src/main/java/org/activemq/advisory/ConsumerEventSource.java
+++ b/activemq-core/src/main/java/org/activemq/advisory/ConsumerEventSource.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.advisory;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
diff --git a/activemq-core/src/main/java/org/activemq/advisory/ConsumerListener.java b/activemq-core/src/main/java/org/activemq/advisory/ConsumerListener.java
index 9e3484cab9..a8ca85137a 100644
--- a/activemq-core/src/main/java/org/activemq/advisory/ConsumerListener.java
+++ b/activemq-core/src/main/java/org/activemq/advisory/ConsumerListener.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.advisory;
/**
diff --git a/activemq-core/src/main/java/org/activemq/advisory/ConsumerStartedEvent.java b/activemq-core/src/main/java/org/activemq/advisory/ConsumerStartedEvent.java
index 5be09de7f6..7ca5f94791 100644
--- a/activemq-core/src/main/java/org/activemq/advisory/ConsumerStartedEvent.java
+++ b/activemq-core/src/main/java/org/activemq/advisory/ConsumerStartedEvent.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.advisory;
import org.activemq.command.ActiveMQDestination;
diff --git a/activemq-core/src/main/java/org/activemq/advisory/ConsumerStoppedEvent.java b/activemq-core/src/main/java/org/activemq/advisory/ConsumerStoppedEvent.java
index f7586259c2..e948d9b9d4 100644
--- a/activemq-core/src/main/java/org/activemq/advisory/ConsumerStoppedEvent.java
+++ b/activemq-core/src/main/java/org/activemq/advisory/ConsumerStoppedEvent.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.advisory;
import org.activemq.command.ActiveMQDestination;
diff --git a/activemq-core/src/main/java/org/activemq/broker/AbstractConnection.java b/activemq-core/src/main/java/org/activemq/broker/AbstractConnection.java
index 5c35b8a318..1d37a25ff0 100755
--- a/activemq-core/src/main/java/org/activemq/broker/AbstractConnection.java
+++ b/activemq-core/src/main/java/org/activemq/broker/AbstractConnection.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/broker/Broker.java b/activemq-core/src/main/java/org/activemq/broker/Broker.java
index 12756f151b..d266a04d65 100755
--- a/activemq-core/src/main/java/org/activemq/broker/Broker.java
+++ b/activemq-core/src/main/java/org/activemq/broker/Broker.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker;
import org.activemq.Service;
diff --git a/activemq-core/src/main/java/org/activemq/broker/BrokerFactory.java b/activemq-core/src/main/java/org/activemq/broker/BrokerFactory.java
index e9465ac999..448506e066 100755
--- a/activemq-core/src/main/java/org/activemq/broker/BrokerFactory.java
+++ b/activemq-core/src/main/java/org/activemq/broker/BrokerFactory.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker;
import org.activeio.FactoryFinder;
diff --git a/activemq-core/src/main/java/org/activemq/broker/BrokerFilter.java b/activemq-core/src/main/java/org/activemq/broker/BrokerFilter.java
index 5c37d853af..dbc4128818 100755
--- a/activemq-core/src/main/java/org/activemq/broker/BrokerFilter.java
+++ b/activemq-core/src/main/java/org/activemq/broker/BrokerFilter.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker;
import org.activemq.broker.region.Destination;
diff --git a/activemq-core/src/main/java/org/activemq/broker/BrokerRegistry.java b/activemq-core/src/main/java/org/activemq/broker/BrokerRegistry.java
index 8b3ddbb143..d0a5045c4a 100755
--- a/activemq-core/src/main/java/org/activemq/broker/BrokerRegistry.java
+++ b/activemq-core/src/main/java/org/activemq/broker/BrokerRegistry.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
diff --git a/activemq-core/src/main/java/org/activemq/broker/BrokerService.java b/activemq-core/src/main/java/org/activemq/broker/BrokerService.java
index 2cf90dd748..97e5ff926d 100644
--- a/activemq-core/src/main/java/org/activemq/broker/BrokerService.java
+++ b/activemq-core/src/main/java/org/activemq/broker/BrokerService.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker;
import java.io.File;
diff --git a/activemq-core/src/main/java/org/activemq/broker/CompositeDestinationBroker.java b/activemq-core/src/main/java/org/activemq/broker/CompositeDestinationBroker.java
index 54842b5170..0364a74277 100755
--- a/activemq-core/src/main/java/org/activemq/broker/CompositeDestinationBroker.java
+++ b/activemq-core/src/main/java/org/activemq/broker/CompositeDestinationBroker.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker;
import org.activemq.command.ActiveMQDestination;
diff --git a/activemq-core/src/main/java/org/activemq/broker/Connection.java b/activemq-core/src/main/java/org/activemq/broker/Connection.java
index a3a5b70c75..6b98fbab5c 100755
--- a/activemq-core/src/main/java/org/activemq/broker/Connection.java
+++ b/activemq-core/src/main/java/org/activemq/broker/Connection.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker;
import org.activemq.Service;
diff --git a/activemq-core/src/main/java/org/activemq/broker/ConnectionContext.java b/activemq-core/src/main/java/org/activemq/broker/ConnectionContext.java
index 9f4d8c0f82..25730e7699 100755
--- a/activemq-core/src/main/java/org/activemq/broker/ConnectionContext.java
+++ b/activemq-core/src/main/java/org/activemq/broker/ConnectionContext.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
diff --git a/activemq-core/src/main/java/org/activemq/broker/Connector.java b/activemq-core/src/main/java/org/activemq/broker/Connector.java
index 8a18e1dc36..caa8b68f87 100755
--- a/activemq-core/src/main/java/org/activemq/broker/Connector.java
+++ b/activemq-core/src/main/java/org/activemq/broker/Connector.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker;
import org.activemq.Service;
diff --git a/activemq-core/src/main/java/org/activemq/broker/DefaultBrokerFactory.java b/activemq-core/src/main/java/org/activemq/broker/DefaultBrokerFactory.java
index 520e89622c..1aa6f690e8 100644
--- a/activemq-core/src/main/java/org/activemq/broker/DefaultBrokerFactory.java
+++ b/activemq-core/src/main/java/org/activemq/broker/DefaultBrokerFactory.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker;
import org.activemq.broker.BrokerFactory.BrokerFactoryHandler;
diff --git a/activemq-core/src/main/java/org/activemq/broker/ErrorBroker.java b/activemq-core/src/main/java/org/activemq/broker/ErrorBroker.java
index f2b8873b8b..b0d2453423 100644
--- a/activemq-core/src/main/java/org/activemq/broker/ErrorBroker.java
+++ b/activemq-core/src/main/java/org/activemq/broker/ErrorBroker.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker;
import org.activemq.broker.region.Destination;
diff --git a/activemq-core/src/main/java/org/activemq/broker/Main.java b/activemq-core/src/main/java/org/activemq/broker/Main.java
index 1096a93a73..8fec1d44b2 100755
--- a/activemq-core/src/main/java/org/activemq/broker/Main.java
+++ b/activemq-core/src/main/java/org/activemq/broker/Main.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker;
import java.io.File;
diff --git a/activemq-core/src/main/java/org/activemq/broker/MutableBrokerFilter.java b/activemq-core/src/main/java/org/activemq/broker/MutableBrokerFilter.java
index 4437944e8a..126b688473 100644
--- a/activemq-core/src/main/java/org/activemq/broker/MutableBrokerFilter.java
+++ b/activemq-core/src/main/java/org/activemq/broker/MutableBrokerFilter.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker;
import org.activemq.broker.region.Destination;
diff --git a/activemq-core/src/main/java/org/activemq/broker/TransactionBroker.java b/activemq-core/src/main/java/org/activemq/broker/TransactionBroker.java
index 6f9e016347..86487705cf 100755
--- a/activemq-core/src/main/java/org/activemq/broker/TransactionBroker.java
+++ b/activemq-core/src/main/java/org/activemq/broker/TransactionBroker.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
diff --git a/activemq-core/src/main/java/org/activemq/broker/TransportConnection.java b/activemq-core/src/main/java/org/activemq/broker/TransportConnection.java
index bad46fe291..3f5a029314 100755
--- a/activemq-core/src/main/java/org/activemq/broker/TransportConnection.java
+++ b/activemq-core/src/main/java/org/activemq/broker/TransportConnection.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/broker/TransportConnector.java b/activemq-core/src/main/java/org/activemq/broker/TransportConnector.java
index 51c1a9c975..17ad3556e5 100755
--- a/activemq-core/src/main/java/org/activemq/broker/TransportConnector.java
+++ b/activemq-core/src/main/java/org/activemq/broker/TransportConnector.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/broker/TransportStatusDetector.java b/activemq-core/src/main/java/org/activemq/broker/TransportStatusDetector.java
index 30a298423f..84a1f6e779 100755
--- a/activemq-core/src/main/java/org/activemq/broker/TransportStatusDetector.java
+++ b/activemq-core/src/main/java/org/activemq/broker/TransportStatusDetector.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.broker;
diff --git a/activemq-core/src/main/java/org/activemq/broker/UserIDBroker.java b/activemq-core/src/main/java/org/activemq/broker/UserIDBroker.java
index 2c89e62c18..5de5515e45 100644
--- a/activemq-core/src/main/java/org/activemq/broker/UserIDBroker.java
+++ b/activemq-core/src/main/java/org/activemq/broker/UserIDBroker.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker;
import org.activemq.command.Message;
diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/BrokerView.java b/activemq-core/src/main/java/org/activemq/broker/jmx/BrokerView.java
index f435f3e613..ac2f3b87a2 100755
--- a/activemq-core/src/main/java/org/activemq/broker/jmx/BrokerView.java
+++ b/activemq-core/src/main/java/org/activemq/broker/jmx/BrokerView.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.jmx;
import org.activemq.broker.Broker;
diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/BrokerViewMBean.java b/activemq-core/src/main/java/org/activemq/broker/jmx/BrokerViewMBean.java
index 3491fc5b99..404c499094 100755
--- a/activemq-core/src/main/java/org/activemq/broker/jmx/BrokerViewMBean.java
+++ b/activemq-core/src/main/java/org/activemq/broker/jmx/BrokerViewMBean.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.jmx;
import org.activemq.Service;
diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ConnectionView.java b/activemq-core/src/main/java/org/activemq/broker/jmx/ConnectionView.java
index b00cb3429e..7ec15d505d 100755
--- a/activemq-core/src/main/java/org/activemq/broker/jmx/ConnectionView.java
+++ b/activemq-core/src/main/java/org/activemq/broker/jmx/ConnectionView.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.jmx;
import org.activemq.broker.Connection;
diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ConnectionViewMBean.java b/activemq-core/src/main/java/org/activemq/broker/jmx/ConnectionViewMBean.java
index feb52540cb..16a960899a 100755
--- a/activemq-core/src/main/java/org/activemq/broker/jmx/ConnectionViewMBean.java
+++ b/activemq-core/src/main/java/org/activemq/broker/jmx/ConnectionViewMBean.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.jmx;
import org.activemq.Service;
diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ConnectorView.java b/activemq-core/src/main/java/org/activemq/broker/jmx/ConnectorView.java
index d63c839e1e..5321b2868e 100755
--- a/activemq-core/src/main/java/org/activemq/broker/jmx/ConnectorView.java
+++ b/activemq-core/src/main/java/org/activemq/broker/jmx/ConnectorView.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.jmx;
import org.activemq.broker.Connector;
diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ConnectorViewMBean.java b/activemq-core/src/main/java/org/activemq/broker/jmx/ConnectorViewMBean.java
index 9dd7300354..98fd3fe933 100755
--- a/activemq-core/src/main/java/org/activemq/broker/jmx/ConnectorViewMBean.java
+++ b/activemq-core/src/main/java/org/activemq/broker/jmx/ConnectorViewMBean.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.jmx;
import org.activemq.Service;
diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/DestinationView.java b/activemq-core/src/main/java/org/activemq/broker/jmx/DestinationView.java
index b1c799403a..a837df1a4f 100755
--- a/activemq-core/src/main/java/org/activemq/broker/jmx/DestinationView.java
+++ b/activemq-core/src/main/java/org/activemq/broker/jmx/DestinationView.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.jmx;
import org.activemq.broker.region.Destination;
diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/DestinationViewMBean.java b/activemq-core/src/main/java/org/activemq/broker/jmx/DestinationViewMBean.java
index ef788bdb1e..d1f7ad7ced 100755
--- a/activemq-core/src/main/java/org/activemq/broker/jmx/DestinationViewMBean.java
+++ b/activemq-core/src/main/java/org/activemq/broker/jmx/DestinationViewMBean.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.jmx;
diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedQueueRegion.java b/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedQueueRegion.java
index 59b9485e91..cf22a49973 100755
--- a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedQueueRegion.java
+++ b/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedQueueRegion.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.jmx;
import org.activemq.broker.ConnectionContext;
diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedRegionBroker.java b/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedRegionBroker.java
index 963f24075a..bc21bd50a5 100755
--- a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedRegionBroker.java
+++ b/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedRegionBroker.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.jmx;
import org.activemq.broker.region.Destination;
diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTempQueueRegion.java b/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTempQueueRegion.java
index e30b955cf3..2d103ef2b9 100755
--- a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTempQueueRegion.java
+++ b/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTempQueueRegion.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.jmx;
import org.activemq.broker.ConnectionContext;
diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTempTopicRegion.java b/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTempTopicRegion.java
index f7413198e4..09ab3f776f 100755
--- a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTempTopicRegion.java
+++ b/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTempTopicRegion.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.jmx;
import org.activemq.broker.ConnectionContext;
diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTopicRegion.java b/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTopicRegion.java
index e793bb31c2..4f37aa4d79 100755
--- a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTopicRegion.java
+++ b/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTopicRegion.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.jmx;
import org.activemq.broker.ConnectionContext;
diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTransportConnection.java b/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTransportConnection.java
index bbd230a2a7..a75ab33005 100644
--- a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTransportConnection.java
+++ b/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTransportConnection.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.broker.jmx;
import org.activemq.broker.Broker;
diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTransportConnector.java b/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTransportConnector.java
index 9127e9e7be..f546ae0f46 100755
--- a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTransportConnector.java
+++ b/activemq-core/src/main/java/org/activemq/broker/jmx/ManagedTransportConnector.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.jmx;
import org.activemq.broker.Broker;
diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagementContext.java b/activemq-core/src/main/java/org/activemq/broker/jmx/ManagementContext.java
index 5b89329ac0..8a9088db0a 100644
--- a/activemq-core/src/main/java/org/activemq/broker/jmx/ManagementContext.java
+++ b/activemq-core/src/main/java/org/activemq/broker/jmx/ManagementContext.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.jmx;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/NetworkConnectorView.java b/activemq-core/src/main/java/org/activemq/broker/jmx/NetworkConnectorView.java
index 8c06f51848..93608100b4 100644
--- a/activemq-core/src/main/java/org/activemq/broker/jmx/NetworkConnectorView.java
+++ b/activemq-core/src/main/java/org/activemq/broker/jmx/NetworkConnectorView.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.jmx;
import org.activemq.network.NetworkConnector;
diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/NetworkConnectorViewMBean.java b/activemq-core/src/main/java/org/activemq/broker/jmx/NetworkConnectorViewMBean.java
index 2193d1cf64..e6f61b289a 100644
--- a/activemq-core/src/main/java/org/activemq/broker/jmx/NetworkConnectorViewMBean.java
+++ b/activemq-core/src/main/java/org/activemq/broker/jmx/NetworkConnectorViewMBean.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.jmx;
import org.activemq.Service;
diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ProxyConnectorView.java b/activemq-core/src/main/java/org/activemq/broker/jmx/ProxyConnectorView.java
index 608609541a..3ba8813f57 100644
--- a/activemq-core/src/main/java/org/activemq/broker/jmx/ProxyConnectorView.java
+++ b/activemq-core/src/main/java/org/activemq/broker/jmx/ProxyConnectorView.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.jmx;
import org.activemq.proxy.ProxyConnector;
diff --git a/activemq-core/src/main/java/org/activemq/broker/jmx/ProxyConnectorViewMBean.java b/activemq-core/src/main/java/org/activemq/broker/jmx/ProxyConnectorViewMBean.java
index 075abd5a11..db3047ac98 100644
--- a/activemq-core/src/main/java/org/activemq/broker/jmx/ProxyConnectorViewMBean.java
+++ b/activemq-core/src/main/java/org/activemq/broker/jmx/ProxyConnectorViewMBean.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.jmx;
import org.activemq.Service;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/AbstractRegion.java b/activemq-core/src/main/java/org/activemq/broker/region/AbstractRegion.java
index 736db855bb..b6fa78f8d2 100755
--- a/activemq-core/src/main/java/org/activemq/broker/region/AbstractRegion.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/AbstractRegion.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.region;
import java.util.Iterator;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/AbstractSubscription.java b/activemq-core/src/main/java/org/activemq/broker/region/AbstractSubscription.java
index 30b1b6f7a3..67041401f5 100755
--- a/activemq-core/src/main/java/org/activemq/broker/region/AbstractSubscription.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/AbstractSubscription.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.region;
import javax.jms.InvalidSelectorException;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/ConnectionStatistics.java b/activemq-core/src/main/java/org/activemq/broker/region/ConnectionStatistics.java
index 64cfb77a8b..802890a44f 100644
--- a/activemq-core/src/main/java/org/activemq/broker/region/ConnectionStatistics.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/ConnectionStatistics.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.region;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/ConnectorStatistics.java b/activemq-core/src/main/java/org/activemq/broker/region/ConnectorStatistics.java
index 7454d4ab25..6ff1cf200e 100644
--- a/activemq-core/src/main/java/org/activemq/broker/region/ConnectorStatistics.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/ConnectorStatistics.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.region;
import org.activemq.management.CountStatisticImpl;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/Destination.java b/activemq-core/src/main/java/org/activemq/broker/region/Destination.java
index 9ea837103b..6a65088d55 100755
--- a/activemq-core/src/main/java/org/activemq/broker/region/Destination.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/Destination.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.region;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/DestinationStatistics.java b/activemq-core/src/main/java/org/activemq/broker/region/DestinationStatistics.java
index c142bb4e3b..bbd86e5b39 100755
--- a/activemq-core/src/main/java/org/activemq/broker/region/DestinationStatistics.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/DestinationStatistics.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.region;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/DurableTopicSubscription.java b/activemq-core/src/main/java/org/activemq/broker/region/DurableTopicSubscription.java
index 369fb14f89..88124ec129 100755
--- a/activemq-core/src/main/java/org/activemq/broker/region/DurableTopicSubscription.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/DurableTopicSubscription.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.region;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/MessageReference.java b/activemq-core/src/main/java/org/activemq/broker/region/MessageReference.java
index 1474b6cb6e..70b1cfcaa3 100755
--- a/activemq-core/src/main/java/org/activemq/broker/region/MessageReference.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/MessageReference.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.region;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/PrefetchSubscription.java b/activemq-core/src/main/java/org/activemq/broker/region/PrefetchSubscription.java
index 2dda025172..3306550d23 100755
--- a/activemq-core/src/main/java/org/activemq/broker/region/PrefetchSubscription.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/PrefetchSubscription.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.region;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/Queue.java b/activemq-core/src/main/java/org/activemq/broker/region/Queue.java
index a98135e276..241a797951 100755
--- a/activemq-core/src/main/java/org/activemq/broker/region/Queue.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/Queue.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.region;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/QueueBrowserSubscription.java b/activemq-core/src/main/java/org/activemq/broker/region/QueueBrowserSubscription.java
index 004f78bb94..c52ab73332 100755
--- a/activemq-core/src/main/java/org/activemq/broker/region/QueueBrowserSubscription.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/QueueBrowserSubscription.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.region;
import javax.jms.InvalidSelectorException;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/QueueRegion.java b/activemq-core/src/main/java/org/activemq/broker/region/QueueRegion.java
index 9b3524f644..87849d697a 100755
--- a/activemq-core/src/main/java/org/activemq/broker/region/QueueRegion.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/QueueRegion.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.region;
import org.activemq.broker.ConnectionContext;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/QueueSubscription.java b/activemq-core/src/main/java/org/activemq/broker/region/QueueSubscription.java
index 34d75d1bf4..0c871728ee 100755
--- a/activemq-core/src/main/java/org/activemq/broker/region/QueueSubscription.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/QueueSubscription.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.region;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/Region.java b/activemq-core/src/main/java/org/activemq/broker/region/Region.java
index dd1ab09d3d..9bcb20625b 100755
--- a/activemq-core/src/main/java/org/activemq/broker/region/Region.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/Region.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.region;
import org.activemq.broker.ConnectionContext;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/RegionBroker.java b/activemq-core/src/main/java/org/activemq/broker/region/RegionBroker.java
index ec959812a2..72b27ead36 100755
--- a/activemq-core/src/main/java/org/activemq/broker/region/RegionBroker.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/RegionBroker.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.region;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/Subscription.java b/activemq-core/src/main/java/org/activemq/broker/region/Subscription.java
index a4d0071b7b..aaf370d785 100755
--- a/activemq-core/src/main/java/org/activemq/broker/region/Subscription.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/Subscription.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.region;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/TempQueueRegion.java b/activemq-core/src/main/java/org/activemq/broker/region/TempQueueRegion.java
index 2cb7e1f78e..661bb19f7c 100755
--- a/activemq-core/src/main/java/org/activemq/broker/region/TempQueueRegion.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/TempQueueRegion.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.region;
import javax.jms.InvalidSelectorException;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/TempTopicRegion.java b/activemq-core/src/main/java/org/activemq/broker/region/TempTopicRegion.java
index 01151537af..1abe8a08f9 100755
--- a/activemq-core/src/main/java/org/activemq/broker/region/TempTopicRegion.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/TempTopicRegion.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.region;
import javax.jms.JMSException;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/Topic.java b/activemq-core/src/main/java/org/activemq/broker/region/Topic.java
index 86795e7c71..5cfb8adeaa 100755
--- a/activemq-core/src/main/java/org/activemq/broker/region/Topic.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/Topic.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.region;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/TopicRegion.java b/activemq-core/src/main/java/org/activemq/broker/region/TopicRegion.java
index b98c7aa288..c7bec1cec2 100755
--- a/activemq-core/src/main/java/org/activemq/broker/region/TopicRegion.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/TopicRegion.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.region;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/TopicSubscription.java b/activemq-core/src/main/java/org/activemq/broker/region/TopicSubscription.java
index 25360b4166..155b44165a 100755
--- a/activemq-core/src/main/java/org/activemq/broker/region/TopicSubscription.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/TopicSubscription.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.region;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/DispatchPolicy.java b/activemq-core/src/main/java/org/activemq/broker/region/policy/DispatchPolicy.java
index 6f027dd05d..c608f538b1 100755
--- a/activemq-core/src/main/java/org/activemq/broker/region/policy/DispatchPolicy.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/policy/DispatchPolicy.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.region.policy;
import org.activemq.broker.ConnectionContext;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/FixedSizedSubscriptionRecoveryPolicy.java b/activemq-core/src/main/java/org/activemq/broker/region/policy/FixedSizedSubscriptionRecoveryPolicy.java
index fe6c5cadd7..587228ff4c 100644
--- a/activemq-core/src/main/java/org/activemq/broker/region/policy/FixedSizedSubscriptionRecoveryPolicy.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/policy/FixedSizedSubscriptionRecoveryPolicy.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.region.policy;
import java.util.Iterator;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/LastImageSubscriptionRecoveryPolicy.java b/activemq-core/src/main/java/org/activemq/broker/region/policy/LastImageSubscriptionRecoveryPolicy.java
index 3fe1d12863..931c366083 100644
--- a/activemq-core/src/main/java/org/activemq/broker/region/policy/LastImageSubscriptionRecoveryPolicy.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/policy/LastImageSubscriptionRecoveryPolicy.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.region.policy;
import org.activemq.broker.ConnectionContext;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/MessageQuery.java b/activemq-core/src/main/java/org/activemq/broker/region/policy/MessageQuery.java
index 267f5bdb7f..49185e3158 100644
--- a/activemq-core/src/main/java/org/activemq/broker/region/policy/MessageQuery.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/policy/MessageQuery.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.broker.region.policy;
import org.activemq.command.ActiveMQDestination;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/NoSubscriptionRecoveryPolicy.java b/activemq-core/src/main/java/org/activemq/broker/region/policy/NoSubscriptionRecoveryPolicy.java
index 5750579d25..ad6f1cf160 100644
--- a/activemq-core/src/main/java/org/activemq/broker/region/policy/NoSubscriptionRecoveryPolicy.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/policy/NoSubscriptionRecoveryPolicy.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.region.policy;
import org.activemq.broker.ConnectionContext;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/PolicyEntry.java b/activemq-core/src/main/java/org/activemq/broker/region/policy/PolicyEntry.java
index 4fabfb5fe3..ccf18bce3f 100644
--- a/activemq-core/src/main/java/org/activemq/broker/region/policy/PolicyEntry.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/policy/PolicyEntry.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.broker.region.policy;
import org.activemq.broker.region.Queue;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/PolicyMap.java b/activemq-core/src/main/java/org/activemq/broker/region/policy/PolicyMap.java
index 5921ebd3bf..2df820a21f 100644
--- a/activemq-core/src/main/java/org/activemq/broker/region/policy/PolicyMap.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/policy/PolicyMap.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.broker.region.policy;
import org.activemq.command.ActiveMQDestination;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java b/activemq-core/src/main/java/org/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java
index 4b1bfd770a..04a7c09c61 100644
--- a/activemq-core/src/main/java/org/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.region.policy;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/RoundRobinDispatchPolicy.java b/activemq-core/src/main/java/org/activemq/broker/region/policy/RoundRobinDispatchPolicy.java
index c11731efe8..5c82dca38a 100755
--- a/activemq-core/src/main/java/org/activemq/broker/region/policy/RoundRobinDispatchPolicy.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/policy/RoundRobinDispatchPolicy.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.region.policy;
import java.util.Iterator;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/SimpleDispatchPolicy.java b/activemq-core/src/main/java/org/activemq/broker/region/policy/SimpleDispatchPolicy.java
index 75cb3db3f6..06f8d6c791 100755
--- a/activemq-core/src/main/java/org/activemq/broker/region/policy/SimpleDispatchPolicy.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/policy/SimpleDispatchPolicy.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.region.policy;
import java.util.Iterator;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/StrictOrderDispatchPolicy.java b/activemq-core/src/main/java/org/activemq/broker/region/policy/StrictOrderDispatchPolicy.java
index 8673b3401b..0ac200ff75 100755
--- a/activemq-core/src/main/java/org/activemq/broker/region/policy/StrictOrderDispatchPolicy.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/policy/StrictOrderDispatchPolicy.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.region.policy;
import java.util.Iterator;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/SubscriptionRecoveryPolicy.java b/activemq-core/src/main/java/org/activemq/broker/region/policy/SubscriptionRecoveryPolicy.java
index 1c421eaeb4..1250f7fc8e 100644
--- a/activemq-core/src/main/java/org/activemq/broker/region/policy/SubscriptionRecoveryPolicy.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/policy/SubscriptionRecoveryPolicy.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.region.policy;
import org.activemq.Service;
diff --git a/activemq-core/src/main/java/org/activemq/broker/region/policy/TimedSubscriptionRecoveryPolicy.java b/activemq-core/src/main/java/org/activemq/broker/region/policy/TimedSubscriptionRecoveryPolicy.java
index 715ea1fdb9..d2e8175785 100644
--- a/activemq-core/src/main/java/org/activemq/broker/region/policy/TimedSubscriptionRecoveryPolicy.java
+++ b/activemq-core/src/main/java/org/activemq/broker/region/policy/TimedSubscriptionRecoveryPolicy.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker.region.policy;
import java.util.ArrayList;
diff --git a/activemq-core/src/main/java/org/activemq/command/ActiveMQBytesMessage.java b/activemq-core/src/main/java/org/activemq/command/ActiveMQBytesMessage.java
index d7d4e14f0d..24a1859cbb 100755
--- a/activemq-core/src/main/java/org/activemq/command/ActiveMQBytesMessage.java
+++ b/activemq-core/src/main/java/org/activemq/command/ActiveMQBytesMessage.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/command/ActiveMQDestination.java b/activemq-core/src/main/java/org/activemq/command/ActiveMQDestination.java
index b3d047f585..410e5babd5 100755
--- a/activemq-core/src/main/java/org/activemq/command/ActiveMQDestination.java
+++ b/activemq-core/src/main/java/org/activemq/command/ActiveMQDestination.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import java.io.Externalizable;
diff --git a/activemq-core/src/main/java/org/activemq/command/ActiveMQMapMessage.java b/activemq-core/src/main/java/org/activemq/command/ActiveMQMapMessage.java
index d5db2dbbb9..5f18fcdc75 100755
--- a/activemq-core/src/main/java/org/activemq/command/ActiveMQMapMessage.java
+++ b/activemq-core/src/main/java/org/activemq/command/ActiveMQMapMessage.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/command/ActiveMQMessage.java b/activemq-core/src/main/java/org/activemq/command/ActiveMQMessage.java
index 2082fc9e89..cb3ab7720a 100755
--- a/activemq-core/src/main/java/org/activemq/command/ActiveMQMessage.java
+++ b/activemq-core/src/main/java/org/activemq/command/ActiveMQMessage.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/command/ActiveMQObjectMessage.java b/activemq-core/src/main/java/org/activemq/command/ActiveMQObjectMessage.java
index 9cfe186df6..529a54bce0 100755
--- a/activemq-core/src/main/java/org/activemq/command/ActiveMQObjectMessage.java
+++ b/activemq-core/src/main/java/org/activemq/command/ActiveMQObjectMessage.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
diff --git a/activemq-core/src/main/java/org/activemq/command/ActiveMQQueue.java b/activemq-core/src/main/java/org/activemq/command/ActiveMQQueue.java
index 097ae2ee37..275102f2c0 100755
--- a/activemq-core/src/main/java/org/activemq/command/ActiveMQQueue.java
+++ b/activemq-core/src/main/java/org/activemq/command/ActiveMQQueue.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import javax.jms.JMSException;
diff --git a/activemq-core/src/main/java/org/activemq/command/ActiveMQStreamMessage.java b/activemq-core/src/main/java/org/activemq/command/ActiveMQStreamMessage.java
index b2e6ecfca2..52c6a4c197 100755
--- a/activemq-core/src/main/java/org/activemq/command/ActiveMQStreamMessage.java
+++ b/activemq-core/src/main/java/org/activemq/command/ActiveMQStreamMessage.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
diff --git a/activemq-core/src/main/java/org/activemq/command/ActiveMQTempDestination.java b/activemq-core/src/main/java/org/activemq/command/ActiveMQTempDestination.java
index 343f7c81b5..3dd4483b6d 100755
--- a/activemq-core/src/main/java/org/activemq/command/ActiveMQTempDestination.java
+++ b/activemq-core/src/main/java/org/activemq/command/ActiveMQTempDestination.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import javax.jms.JMSException;
diff --git a/activemq-core/src/main/java/org/activemq/command/ActiveMQTempQueue.java b/activemq-core/src/main/java/org/activemq/command/ActiveMQTempQueue.java
index 16709f68b0..1cfdc5ee55 100755
--- a/activemq-core/src/main/java/org/activemq/command/ActiveMQTempQueue.java
+++ b/activemq-core/src/main/java/org/activemq/command/ActiveMQTempQueue.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import javax.jms.JMSException;
diff --git a/activemq-core/src/main/java/org/activemq/command/ActiveMQTempTopic.java b/activemq-core/src/main/java/org/activemq/command/ActiveMQTempTopic.java
index f173bedf02..a0057a61e9 100755
--- a/activemq-core/src/main/java/org/activemq/command/ActiveMQTempTopic.java
+++ b/activemq-core/src/main/java/org/activemq/command/ActiveMQTempTopic.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import javax.jms.JMSException;
diff --git a/activemq-core/src/main/java/org/activemq/command/ActiveMQTextMessage.java b/activemq-core/src/main/java/org/activemq/command/ActiveMQTextMessage.java
index e823018a7f..a972eed6e4 100755
--- a/activemq-core/src/main/java/org/activemq/command/ActiveMQTextMessage.java
+++ b/activemq-core/src/main/java/org/activemq/command/ActiveMQTextMessage.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/command/ActiveMQTopic.java b/activemq-core/src/main/java/org/activemq/command/ActiveMQTopic.java
index b7acb95b41..9a062d68d0 100755
--- a/activemq-core/src/main/java/org/activemq/command/ActiveMQTopic.java
+++ b/activemq-core/src/main/java/org/activemq/command/ActiveMQTopic.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import javax.jms.JMSException;
diff --git a/activemq-core/src/main/java/org/activemq/command/BaseCommand.java b/activemq-core/src/main/java/org/activemq/command/BaseCommand.java
index ab3bec3c6c..2ab6c33acc 100755
--- a/activemq-core/src/main/java/org/activemq/command/BaseCommand.java
+++ b/activemq-core/src/main/java/org/activemq/command/BaseCommand.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import java.lang.reflect.Field;
diff --git a/activemq-core/src/main/java/org/activemq/command/BrokerId.java b/activemq-core/src/main/java/org/activemq/command/BrokerId.java
index 1de9f5bcc6..5856e04bee 100755
--- a/activemq-core/src/main/java/org/activemq/command/BrokerId.java
+++ b/activemq-core/src/main/java/org/activemq/command/BrokerId.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
diff --git a/activemq-core/src/main/java/org/activemq/command/BrokerInfo.java b/activemq-core/src/main/java/org/activemq/command/BrokerInfo.java
index 2aaec223ca..a77b2b6e43 100755
--- a/activemq-core/src/main/java/org/activemq/command/BrokerInfo.java
+++ b/activemq-core/src/main/java/org/activemq/command/BrokerInfo.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import org.activemq.state.CommandVisitor;
diff --git a/activemq-core/src/main/java/org/activemq/command/Command.java b/activemq-core/src/main/java/org/activemq/command/Command.java
index 33cff92c66..be6d68288e 100755
--- a/activemq-core/src/main/java/org/activemq/command/Command.java
+++ b/activemq-core/src/main/java/org/activemq/command/Command.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import org.activemq.state.CommandVisitor;
diff --git a/activemq-core/src/main/java/org/activemq/command/CommandTypes.java b/activemq-core/src/main/java/org/activemq/command/CommandTypes.java
index 96f3dc58ee..e446dd526d 100755
--- a/activemq-core/src/main/java/org/activemq/command/CommandTypes.java
+++ b/activemq-core/src/main/java/org/activemq/command/CommandTypes.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
/**
diff --git a/activemq-core/src/main/java/org/activemq/command/ConnectionId.java b/activemq-core/src/main/java/org/activemq/command/ConnectionId.java
index 42d5c29c4b..63be88c22d 100755
--- a/activemq-core/src/main/java/org/activemq/command/ConnectionId.java
+++ b/activemq-core/src/main/java/org/activemq/command/ConnectionId.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
diff --git a/activemq-core/src/main/java/org/activemq/command/ConnectionInfo.java b/activemq-core/src/main/java/org/activemq/command/ConnectionInfo.java
index 178c6e01c4..d62b012e2f 100755
--- a/activemq-core/src/main/java/org/activemq/command/ConnectionInfo.java
+++ b/activemq-core/src/main/java/org/activemq/command/ConnectionInfo.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import org.activemq.state.CommandVisitor;
diff --git a/activemq-core/src/main/java/org/activemq/command/ConsumerId.java b/activemq-core/src/main/java/org/activemq/command/ConsumerId.java
index 6830a873ba..5ec310a6f3 100755
--- a/activemq-core/src/main/java/org/activemq/command/ConsumerId.java
+++ b/activemq-core/src/main/java/org/activemq/command/ConsumerId.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
diff --git a/activemq-core/src/main/java/org/activemq/command/ConsumerInfo.java b/activemq-core/src/main/java/org/activemq/command/ConsumerInfo.java
index 1be181eff8..e3c320b1dd 100755
--- a/activemq-core/src/main/java/org/activemq/command/ConsumerInfo.java
+++ b/activemq-core/src/main/java/org/activemq/command/ConsumerInfo.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import org.activemq.filter.BooleanExpression;
diff --git a/activemq-core/src/main/java/org/activemq/command/ControlCommand.java b/activemq-core/src/main/java/org/activemq/command/ControlCommand.java
index 1a8e12b94b..ce4062ae72 100644
--- a/activemq-core/src/main/java/org/activemq/command/ControlCommand.java
+++ b/activemq-core/src/main/java/org/activemq/command/ControlCommand.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.command;
import org.activemq.state.CommandVisitor;
diff --git a/activemq-core/src/main/java/org/activemq/command/DataArrayResponse.java b/activemq-core/src/main/java/org/activemq/command/DataArrayResponse.java
index 2142f20ec5..712c910acf 100755
--- a/activemq-core/src/main/java/org/activemq/command/DataArrayResponse.java
+++ b/activemq-core/src/main/java/org/activemq/command/DataArrayResponse.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
/**
diff --git a/activemq-core/src/main/java/org/activemq/command/DataResponse.java b/activemq-core/src/main/java/org/activemq/command/DataResponse.java
index 1c948c08f0..dae7e3d44a 100755
--- a/activemq-core/src/main/java/org/activemq/command/DataResponse.java
+++ b/activemq-core/src/main/java/org/activemq/command/DataResponse.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
/**
diff --git a/activemq-core/src/main/java/org/activemq/command/DestinationInfo.java b/activemq-core/src/main/java/org/activemq/command/DestinationInfo.java
index ba27356ed0..4c3e24e5f9 100755
--- a/activemq-core/src/main/java/org/activemq/command/DestinationInfo.java
+++ b/activemq-core/src/main/java/org/activemq/command/DestinationInfo.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/command/DiscoveryEvent.java b/activemq-core/src/main/java/org/activemq/command/DiscoveryEvent.java
index b89a300b42..8f138f5390 100755
--- a/activemq-core/src/main/java/org/activemq/command/DiscoveryEvent.java
+++ b/activemq-core/src/main/java/org/activemq/command/DiscoveryEvent.java
@@ -1,20 +1,19 @@
/**
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
diff --git a/activemq-core/src/main/java/org/activemq/command/ExceptionResponse.java b/activemq-core/src/main/java/org/activemq/command/ExceptionResponse.java
index 29537d6fab..1affc9aa0a 100755
--- a/activemq-core/src/main/java/org/activemq/command/ExceptionResponse.java
+++ b/activemq-core/src/main/java/org/activemq/command/ExceptionResponse.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
/**
diff --git a/activemq-core/src/main/java/org/activemq/command/FlushCommand.java b/activemq-core/src/main/java/org/activemq/command/FlushCommand.java
index 32b78c8d2a..64ccc9ddf3 100644
--- a/activemq-core/src/main/java/org/activemq/command/FlushCommand.java
+++ b/activemq-core/src/main/java/org/activemq/command/FlushCommand.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import org.activemq.state.CommandVisitor;
diff --git a/activemq-core/src/main/java/org/activemq/command/IntegerResponse.java b/activemq-core/src/main/java/org/activemq/command/IntegerResponse.java
index ccd97cd7de..f113debbd4 100755
--- a/activemq-core/src/main/java/org/activemq/command/IntegerResponse.java
+++ b/activemq-core/src/main/java/org/activemq/command/IntegerResponse.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
/**
diff --git a/activemq-core/src/main/java/org/activemq/command/JournalQueueAck.java b/activemq-core/src/main/java/org/activemq/command/JournalQueueAck.java
index 66f9664ff6..6b88e7b7ed 100755
--- a/activemq-core/src/main/java/org/activemq/command/JournalQueueAck.java
+++ b/activemq-core/src/main/java/org/activemq/command/JournalQueueAck.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
/**
diff --git a/activemq-core/src/main/java/org/activemq/command/JournalTopicAck.java b/activemq-core/src/main/java/org/activemq/command/JournalTopicAck.java
index de01dd5906..0dbddf605f 100755
--- a/activemq-core/src/main/java/org/activemq/command/JournalTopicAck.java
+++ b/activemq-core/src/main/java/org/activemq/command/JournalTopicAck.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
/**
diff --git a/activemq-core/src/main/java/org/activemq/command/JournalTrace.java b/activemq-core/src/main/java/org/activemq/command/JournalTrace.java
index 8edb2f6b4d..56273fc639 100755
--- a/activemq-core/src/main/java/org/activemq/command/JournalTrace.java
+++ b/activemq-core/src/main/java/org/activemq/command/JournalTrace.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
/**
diff --git a/activemq-core/src/main/java/org/activemq/command/JournalTransaction.java b/activemq-core/src/main/java/org/activemq/command/JournalTransaction.java
index 0629078e22..fe5fd215ac 100755
--- a/activemq-core/src/main/java/org/activemq/command/JournalTransaction.java
+++ b/activemq-core/src/main/java/org/activemq/command/JournalTransaction.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
diff --git a/activemq-core/src/main/java/org/activemq/command/KeepAliveInfo.java b/activemq-core/src/main/java/org/activemq/command/KeepAliveInfo.java
index 21728dbbf6..b3823e62e2 100755
--- a/activemq-core/src/main/java/org/activemq/command/KeepAliveInfo.java
+++ b/activemq-core/src/main/java/org/activemq/command/KeepAliveInfo.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import org.activemq.state.CommandVisitor;
diff --git a/activemq-core/src/main/java/org/activemq/command/LocalTransactionId.java b/activemq-core/src/main/java/org/activemq/command/LocalTransactionId.java
index 09ed3b2307..2c6b496e08 100755
--- a/activemq-core/src/main/java/org/activemq/command/LocalTransactionId.java
+++ b/activemq-core/src/main/java/org/activemq/command/LocalTransactionId.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
/**
diff --git a/activemq-core/src/main/java/org/activemq/command/MarshallAware.java b/activemq-core/src/main/java/org/activemq/command/MarshallAware.java
index 6ce3c91c07..dc7613f2fd 100755
--- a/activemq-core/src/main/java/org/activemq/command/MarshallAware.java
+++ b/activemq-core/src/main/java/org/activemq/command/MarshallAware.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/command/Message.java b/activemq-core/src/main/java/org/activemq/command/Message.java
index 121c0cc744..81d11b8c3b 100755
--- a/activemq-core/src/main/java/org/activemq/command/Message.java
+++ b/activemq-core/src/main/java/org/activemq/command/Message.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/command/MessageAck.java b/activemq-core/src/main/java/org/activemq/command/MessageAck.java
index c559a453d0..f5ea369ca4 100755
--- a/activemq-core/src/main/java/org/activemq/command/MessageAck.java
+++ b/activemq-core/src/main/java/org/activemq/command/MessageAck.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import org.activemq.state.CommandVisitor;
diff --git a/activemq-core/src/main/java/org/activemq/command/MessageDispatch.java b/activemq-core/src/main/java/org/activemq/command/MessageDispatch.java
index 7d56c56cc2..f04a72029a 100755
--- a/activemq-core/src/main/java/org/activemq/command/MessageDispatch.java
+++ b/activemq-core/src/main/java/org/activemq/command/MessageDispatch.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import org.activemq.state.CommandVisitor;
diff --git a/activemq-core/src/main/java/org/activemq/command/MessageId.java b/activemq-core/src/main/java/org/activemq/command/MessageId.java
index d5301fe67b..4c9e2d30aa 100755
--- a/activemq-core/src/main/java/org/activemq/command/MessageId.java
+++ b/activemq-core/src/main/java/org/activemq/command/MessageId.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
diff --git a/activemq-core/src/main/java/org/activemq/command/ProducerId.java b/activemq-core/src/main/java/org/activemq/command/ProducerId.java
index a62b95aa66..fdeeb45054 100755
--- a/activemq-core/src/main/java/org/activemq/command/ProducerId.java
+++ b/activemq-core/src/main/java/org/activemq/command/ProducerId.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
/**
diff --git a/activemq-core/src/main/java/org/activemq/command/ProducerInfo.java b/activemq-core/src/main/java/org/activemq/command/ProducerInfo.java
index 0e59793d42..0ee7d00be9 100755
--- a/activemq-core/src/main/java/org/activemq/command/ProducerInfo.java
+++ b/activemq-core/src/main/java/org/activemq/command/ProducerInfo.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import org.activemq.state.CommandVisitor;
diff --git a/activemq-core/src/main/java/org/activemq/command/RedeliveryPolicy.java b/activemq-core/src/main/java/org/activemq/command/RedeliveryPolicy.java
index 0c62c88172..f0e9c90299 100644
--- a/activemq-core/src/main/java/org/activemq/command/RedeliveryPolicy.java
+++ b/activemq-core/src/main/java/org/activemq/command/RedeliveryPolicy.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
/**
diff --git a/activemq-core/src/main/java/org/activemq/command/RemoveSubscriptionInfo.java b/activemq-core/src/main/java/org/activemq/command/RemoveSubscriptionInfo.java
index bd1e268f73..c7840c1552 100755
--- a/activemq-core/src/main/java/org/activemq/command/RemoveSubscriptionInfo.java
+++ b/activemq-core/src/main/java/org/activemq/command/RemoveSubscriptionInfo.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import org.activemq.state.CommandVisitor;
diff --git a/activemq-core/src/main/java/org/activemq/command/Response.java b/activemq-core/src/main/java/org/activemq/command/Response.java
index cda8a4c5dd..497dabdf93 100755
--- a/activemq-core/src/main/java/org/activemq/command/Response.java
+++ b/activemq-core/src/main/java/org/activemq/command/Response.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import org.activemq.state.CommandVisitor;
diff --git a/activemq-core/src/main/java/org/activemq/command/SessionId.java b/activemq-core/src/main/java/org/activemq/command/SessionId.java
index 4f0bc24a2d..e3beb18f71 100755
--- a/activemq-core/src/main/java/org/activemq/command/SessionId.java
+++ b/activemq-core/src/main/java/org/activemq/command/SessionId.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
/**
diff --git a/activemq-core/src/main/java/org/activemq/command/SessionInfo.java b/activemq-core/src/main/java/org/activemq/command/SessionInfo.java
index 24fa271a6c..2ec3bfbc53 100755
--- a/activemq-core/src/main/java/org/activemq/command/SessionInfo.java
+++ b/activemq-core/src/main/java/org/activemq/command/SessionInfo.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import org.activemq.state.CommandVisitor;
diff --git a/activemq-core/src/main/java/org/activemq/command/ShutdownInfo.java b/activemq-core/src/main/java/org/activemq/command/ShutdownInfo.java
index 14c66aed63..3063c2bda5 100755
--- a/activemq-core/src/main/java/org/activemq/command/ShutdownInfo.java
+++ b/activemq-core/src/main/java/org/activemq/command/ShutdownInfo.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import org.activemq.state.CommandVisitor;
diff --git a/activemq-core/src/main/java/org/activemq/command/SubscriptionInfo.java b/activemq-core/src/main/java/org/activemq/command/SubscriptionInfo.java
index ebdfb3b8a5..ea07c0f4fe 100755
--- a/activemq-core/src/main/java/org/activemq/command/SubscriptionInfo.java
+++ b/activemq-core/src/main/java/org/activemq/command/SubscriptionInfo.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
diff --git a/activemq-core/src/main/java/org/activemq/command/TransactionId.java b/activemq-core/src/main/java/org/activemq/command/TransactionId.java
index 502a1059a0..f7e7cac199 100755
--- a/activemq-core/src/main/java/org/activemq/command/TransactionId.java
+++ b/activemq-core/src/main/java/org/activemq/command/TransactionId.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
/**
diff --git a/activemq-core/src/main/java/org/activemq/command/TransactionInfo.java b/activemq-core/src/main/java/org/activemq/command/TransactionInfo.java
index d491f84e4f..751b832061 100755
--- a/activemq-core/src/main/java/org/activemq/command/TransactionInfo.java
+++ b/activemq-core/src/main/java/org/activemq/command/TransactionInfo.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/command/WireFormatInfo.java b/activemq-core/src/main/java/org/activemq/command/WireFormatInfo.java
index 1ecdda2c6a..803fdb5878 100755
--- a/activemq-core/src/main/java/org/activemq/command/WireFormatInfo.java
+++ b/activemq-core/src/main/java/org/activemq/command/WireFormatInfo.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.command;
import org.activemq.state.CommandVisitor;
diff --git a/activemq-core/src/main/java/org/activemq/command/XATransactionId.java b/activemq-core/src/main/java/org/activemq/command/XATransactionId.java
index 189526c07e..765ef43152 100755
--- a/activemq-core/src/main/java/org/activemq/command/XATransactionId.java
+++ b/activemq-core/src/main/java/org/activemq/command/XATransactionId.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import java.util.Arrays;
diff --git a/activemq-core/src/main/java/org/activemq/filter/ArithmeticExpression.java b/activemq-core/src/main/java/org/activemq/filter/ArithmeticExpression.java
index 9bf2625da2..f751061bd9 100755
--- a/activemq-core/src/main/java/org/activemq/filter/ArithmeticExpression.java
+++ b/activemq-core/src/main/java/org/activemq/filter/ArithmeticExpression.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
import javax.jms.JMSException;
diff --git a/activemq-core/src/main/java/org/activemq/filter/BinaryExpression.java b/activemq-core/src/main/java/org/activemq/filter/BinaryExpression.java
index 889bae5e0d..5a0e3e40f1 100755
--- a/activemq-core/src/main/java/org/activemq/filter/BinaryExpression.java
+++ b/activemq-core/src/main/java/org/activemq/filter/BinaryExpression.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
diff --git a/activemq-core/src/main/java/org/activemq/filter/BooleanExpression.java b/activemq-core/src/main/java/org/activemq/filter/BooleanExpression.java
index 3272c829a7..c85c46cf3e 100755
--- a/activemq-core/src/main/java/org/activemq/filter/BooleanExpression.java
+++ b/activemq-core/src/main/java/org/activemq/filter/BooleanExpression.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
import javax.jms.JMSException;
diff --git a/activemq-core/src/main/java/org/activemq/filter/ComparisonExpression.java b/activemq-core/src/main/java/org/activemq/filter/ComparisonExpression.java
index 371b84b672..3ddf52a3ad 100755
--- a/activemq-core/src/main/java/org/activemq/filter/ComparisonExpression.java
+++ b/activemq-core/src/main/java/org/activemq/filter/ComparisonExpression.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
import java.util.HashSet;
diff --git a/activemq-core/src/main/java/org/activemq/filter/CompositeDestinationFilter.java b/activemq-core/src/main/java/org/activemq/filter/CompositeDestinationFilter.java
index 641400f6d3..5e397ddbe3 100755
--- a/activemq-core/src/main/java/org/activemq/filter/CompositeDestinationFilter.java
+++ b/activemq-core/src/main/java/org/activemq/filter/CompositeDestinationFilter.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
import org.activemq.command.ActiveMQDestination;
diff --git a/activemq-core/src/main/java/org/activemq/filter/ConstantExpression.java b/activemq-core/src/main/java/org/activemq/filter/ConstantExpression.java
index 1efed266eb..b49aec3c0f 100755
--- a/activemq-core/src/main/java/org/activemq/filter/ConstantExpression.java
+++ b/activemq-core/src/main/java/org/activemq/filter/ConstantExpression.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
import java.math.BigDecimal;
diff --git a/activemq-core/src/main/java/org/activemq/filter/DestinationFilter.java b/activemq-core/src/main/java/org/activemq/filter/DestinationFilter.java
index 9ae9e8f152..62f663f907 100755
--- a/activemq-core/src/main/java/org/activemq/filter/DestinationFilter.java
+++ b/activemq-core/src/main/java/org/activemq/filter/DestinationFilter.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
diff --git a/activemq-core/src/main/java/org/activemq/filter/DestinationMap.java b/activemq-core/src/main/java/org/activemq/filter/DestinationMap.java
index f540088da5..3adddc346c 100755
--- a/activemq-core/src/main/java/org/activemq/filter/DestinationMap.java
+++ b/activemq-core/src/main/java/org/activemq/filter/DestinationMap.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
import java.util.HashSet;
diff --git a/activemq-core/src/main/java/org/activemq/filter/DestinationMapEntry.java b/activemq-core/src/main/java/org/activemq/filter/DestinationMapEntry.java
index ad64b402c1..31016bf6c1 100644
--- a/activemq-core/src/main/java/org/activemq/filter/DestinationMapEntry.java
+++ b/activemq-core/src/main/java/org/activemq/filter/DestinationMapEntry.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.filter;
import org.activemq.command.ActiveMQDestination;
diff --git a/activemq-core/src/main/java/org/activemq/filter/DestinationMapNode.java b/activemq-core/src/main/java/org/activemq/filter/DestinationMapNode.java
index 00f97805de..032448b460 100755
--- a/activemq-core/src/main/java/org/activemq/filter/DestinationMapNode.java
+++ b/activemq-core/src/main/java/org/activemq/filter/DestinationMapNode.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
import java.util.ArrayList;
diff --git a/activemq-core/src/main/java/org/activemq/filter/DestinationPath.java b/activemq-core/src/main/java/org/activemq/filter/DestinationPath.java
index 126551d251..f74b4aabad 100755
--- a/activemq-core/src/main/java/org/activemq/filter/DestinationPath.java
+++ b/activemq-core/src/main/java/org/activemq/filter/DestinationPath.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
diff --git a/activemq-core/src/main/java/org/activemq/filter/Expression.java b/activemq-core/src/main/java/org/activemq/filter/Expression.java
index 9eaf0768e9..57b4333b60 100755
--- a/activemq-core/src/main/java/org/activemq/filter/Expression.java
+++ b/activemq-core/src/main/java/org/activemq/filter/Expression.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
diff --git a/activemq-core/src/main/java/org/activemq/filter/JAXPXPathEvaluator.java b/activemq-core/src/main/java/org/activemq/filter/JAXPXPathEvaluator.java
index fcea876110..e75d88d63b 100755
--- a/activemq-core/src/main/java/org/activemq/filter/JAXPXPathEvaluator.java
+++ b/activemq-core/src/main/java/org/activemq/filter/JAXPXPathEvaluator.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
import java.io.StringReader;
diff --git a/activemq-core/src/main/java/org/activemq/filter/LogicExpression.java b/activemq-core/src/main/java/org/activemq/filter/LogicExpression.java
index 94ae59686f..d760edb860 100755
--- a/activemq-core/src/main/java/org/activemq/filter/LogicExpression.java
+++ b/activemq-core/src/main/java/org/activemq/filter/LogicExpression.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
import javax.jms.JMSException;
diff --git a/activemq-core/src/main/java/org/activemq/filter/MessageEvaluationContext.java b/activemq-core/src/main/java/org/activemq/filter/MessageEvaluationContext.java
index 8ce9bb6c94..e1c02a8599 100755
--- a/activemq-core/src/main/java/org/activemq/filter/MessageEvaluationContext.java
+++ b/activemq-core/src/main/java/org/activemq/filter/MessageEvaluationContext.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.filter;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/filter/MultiExpressionEvaluator.java b/activemq-core/src/main/java/org/activemq/filter/MultiExpressionEvaluator.java
index 900bf1fdf5..29c26641c1 100755
--- a/activemq-core/src/main/java/org/activemq/filter/MultiExpressionEvaluator.java
+++ b/activemq-core/src/main/java/org/activemq/filter/MultiExpressionEvaluator.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
import java.util.ArrayList;
diff --git a/activemq-core/src/main/java/org/activemq/filter/NoLocalExpression.java b/activemq-core/src/main/java/org/activemq/filter/NoLocalExpression.java
index 410216f361..38567259a0 100755
--- a/activemq-core/src/main/java/org/activemq/filter/NoLocalExpression.java
+++ b/activemq-core/src/main/java/org/activemq/filter/NoLocalExpression.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/filter/PrefixDestinationFilter.java b/activemq-core/src/main/java/org/activemq/filter/PrefixDestinationFilter.java
index 4547ca763e..1a293ff410 100755
--- a/activemq-core/src/main/java/org/activemq/filter/PrefixDestinationFilter.java
+++ b/activemq-core/src/main/java/org/activemq/filter/PrefixDestinationFilter.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
diff --git a/activemq-core/src/main/java/org/activemq/filter/PropertyExpression.java b/activemq-core/src/main/java/org/activemq/filter/PropertyExpression.java
index 3bdaf8f4f3..b9937b544d 100755
--- a/activemq-core/src/main/java/org/activemq/filter/PropertyExpression.java
+++ b/activemq-core/src/main/java/org/activemq/filter/PropertyExpression.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
diff --git a/activemq-core/src/main/java/org/activemq/filter/SimpleDestinationFilter.java b/activemq-core/src/main/java/org/activemq/filter/SimpleDestinationFilter.java
index 1c7951892a..bec8c5d085 100755
--- a/activemq-core/src/main/java/org/activemq/filter/SimpleDestinationFilter.java
+++ b/activemq-core/src/main/java/org/activemq/filter/SimpleDestinationFilter.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
diff --git a/activemq-core/src/main/java/org/activemq/filter/WildcardDestinationFilter.java b/activemq-core/src/main/java/org/activemq/filter/WildcardDestinationFilter.java
index f3cf51484c..88ec4890c1 100755
--- a/activemq-core/src/main/java/org/activemq/filter/WildcardDestinationFilter.java
+++ b/activemq-core/src/main/java/org/activemq/filter/WildcardDestinationFilter.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
diff --git a/activemq-core/src/main/java/org/activemq/filter/XMLBeansXPathEvaluator.java b/activemq-core/src/main/java/org/activemq/filter/XMLBeansXPathEvaluator.java
index 3e5a8d80b4..da1a7293c7 100755
--- a/activemq-core/src/main/java/org/activemq/filter/XMLBeansXPathEvaluator.java
+++ b/activemq-core/src/main/java/org/activemq/filter/XMLBeansXPathEvaluator.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
diff --git a/activemq-core/src/main/java/org/activemq/filter/XPathExpression.java b/activemq-core/src/main/java/org/activemq/filter/XPathExpression.java
index be241e02d6..cf74f4fc9a 100755
--- a/activemq-core/src/main/java/org/activemq/filter/XPathExpression.java
+++ b/activemq-core/src/main/java/org/activemq/filter/XPathExpression.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/filter/XQueryExpression.java b/activemq-core/src/main/java/org/activemq/filter/XQueryExpression.java
index 330bdf0f70..b6c5243ced 100755
--- a/activemq-core/src/main/java/org/activemq/filter/XQueryExpression.java
+++ b/activemq-core/src/main/java/org/activemq/filter/XQueryExpression.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
import javax.jms.JMSException;
diff --git a/activemq-core/src/main/java/org/activemq/filter/XalanXPathEvaluator.java b/activemq-core/src/main/java/org/activemq/filter/XalanXPathEvaluator.java
index e3be77539f..182a2a5065 100755
--- a/activemq-core/src/main/java/org/activemq/filter/XalanXPathEvaluator.java
+++ b/activemq-core/src/main/java/org/activemq/filter/XalanXPathEvaluator.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
diff --git a/activemq-core/src/main/java/org/activemq/jndi/ActiveMQInitialContextFactory.java b/activemq-core/src/main/java/org/activemq/jndi/ActiveMQInitialContextFactory.java
index 8a285caf30..432dfc417d 100755
--- a/activemq-core/src/main/java/org/activemq/jndi/ActiveMQInitialContextFactory.java
+++ b/activemq-core/src/main/java/org/activemq/jndi/ActiveMQInitialContextFactory.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.jndi;
import java.net.URISyntaxException;
diff --git a/activemq-core/src/main/java/org/activemq/jndi/ActiveMQWASInitialContextFactory.java b/activemq-core/src/main/java/org/activemq/jndi/ActiveMQWASInitialContextFactory.java
index c11f80441d..df68b61da7 100644
--- a/activemq-core/src/main/java/org/activemq/jndi/ActiveMQWASInitialContextFactory.java
+++ b/activemq-core/src/main/java/org/activemq/jndi/ActiveMQWASInitialContextFactory.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2005 Pawel Tucholski
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.jndi;
import javax.naming.Context;
diff --git a/activemq-core/src/main/java/org/activemq/jndi/LazyCreateContext.java b/activemq-core/src/main/java/org/activemq/jndi/LazyCreateContext.java
index b1c4ff648d..0a4a33532f 100755
--- a/activemq-core/src/main/java/org/activemq/jndi/LazyCreateContext.java
+++ b/activemq-core/src/main/java/org/activemq/jndi/LazyCreateContext.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.jndi;
import javax.naming.NameNotFoundException;
diff --git a/activemq-core/src/main/java/org/activemq/jndi/NameParserImpl.java b/activemq-core/src/main/java/org/activemq/jndi/NameParserImpl.java
index 82fab553bb..c00a548da3 100755
--- a/activemq-core/src/main/java/org/activemq/jndi/NameParserImpl.java
+++ b/activemq-core/src/main/java/org/activemq/jndi/NameParserImpl.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.jndi;
diff --git a/activemq-core/src/main/java/org/activemq/jndi/ReadOnlyContext.java b/activemq-core/src/main/java/org/activemq/jndi/ReadOnlyContext.java
index a61dab681f..58c58b1cae 100755
--- a/activemq-core/src/main/java/org/activemq/jndi/ReadOnlyContext.java
+++ b/activemq-core/src/main/java/org/activemq/jndi/ReadOnlyContext.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.jndi;
diff --git a/activemq-core/src/main/java/org/activemq/management/BoundaryStatisticImpl.java b/activemq-core/src/main/java/org/activemq/management/BoundaryStatisticImpl.java
index 49e82bec35..b8cc7b06bb 100755
--- a/activemq-core/src/main/java/org/activemq/management/BoundaryStatisticImpl.java
+++ b/activemq-core/src/main/java/org/activemq/management/BoundaryStatisticImpl.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
diff --git a/activemq-core/src/main/java/org/activemq/management/BoundedRangeStatisticImpl.java b/activemq-core/src/main/java/org/activemq/management/BoundedRangeStatisticImpl.java
index a6bcbef5b2..a36bbd456f 100755
--- a/activemq-core/src/main/java/org/activemq/management/BoundedRangeStatisticImpl.java
+++ b/activemq-core/src/main/java/org/activemq/management/BoundedRangeStatisticImpl.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
diff --git a/activemq-core/src/main/java/org/activemq/management/CountStatisticImpl.java b/activemq-core/src/main/java/org/activemq/management/CountStatisticImpl.java
index 4c2a6fad6c..941b7f4c69 100755
--- a/activemq-core/src/main/java/org/activemq/management/CountStatisticImpl.java
+++ b/activemq-core/src/main/java/org/activemq/management/CountStatisticImpl.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
import javax.management.j2ee.statistics.CountStatistic;
diff --git a/activemq-core/src/main/java/org/activemq/management/JCAConnectionPoolStatsImpl.java b/activemq-core/src/main/java/org/activemq/management/JCAConnectionPoolStatsImpl.java
index cb7794832b..f8b4892742 100755
--- a/activemq-core/src/main/java/org/activemq/management/JCAConnectionPoolStatsImpl.java
+++ b/activemq-core/src/main/java/org/activemq/management/JCAConnectionPoolStatsImpl.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
diff --git a/activemq-core/src/main/java/org/activemq/management/JCAConnectionStatsImpl.java b/activemq-core/src/main/java/org/activemq/management/JCAConnectionStatsImpl.java
index 10699bb009..34c6ca0447 100755
--- a/activemq-core/src/main/java/org/activemq/management/JCAConnectionStatsImpl.java
+++ b/activemq-core/src/main/java/org/activemq/management/JCAConnectionStatsImpl.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
diff --git a/activemq-core/src/main/java/org/activemq/management/JCAStatsImpl.java b/activemq-core/src/main/java/org/activemq/management/JCAStatsImpl.java
index eb1761b6cf..4e2db83c1a 100755
--- a/activemq-core/src/main/java/org/activemq/management/JCAStatsImpl.java
+++ b/activemq-core/src/main/java/org/activemq/management/JCAStatsImpl.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
diff --git a/activemq-core/src/main/java/org/activemq/management/JMSConnectionStatsImpl.java b/activemq-core/src/main/java/org/activemq/management/JMSConnectionStatsImpl.java
index a8263c4de4..b1c8e63e15 100755
--- a/activemq-core/src/main/java/org/activemq/management/JMSConnectionStatsImpl.java
+++ b/activemq-core/src/main/java/org/activemq/management/JMSConnectionStatsImpl.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
import org.activemq.ActiveMQSession;
diff --git a/activemq-core/src/main/java/org/activemq/management/JMSConsumerStatsImpl.java b/activemq-core/src/main/java/org/activemq/management/JMSConsumerStatsImpl.java
index 88d6fbefbb..353c9ed966 100755
--- a/activemq-core/src/main/java/org/activemq/management/JMSConsumerStatsImpl.java
+++ b/activemq-core/src/main/java/org/activemq/management/JMSConsumerStatsImpl.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
import javax.jms.Destination;
diff --git a/activemq-core/src/main/java/org/activemq/management/JMSEndpointStatsImpl.java b/activemq-core/src/main/java/org/activemq/management/JMSEndpointStatsImpl.java
index 16f5deb927..508732aacc 100755
--- a/activemq-core/src/main/java/org/activemq/management/JMSEndpointStatsImpl.java
+++ b/activemq-core/src/main/java/org/activemq/management/JMSEndpointStatsImpl.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
import javax.jms.Destination;
diff --git a/activemq-core/src/main/java/org/activemq/management/JMSProducerStatsImpl.java b/activemq-core/src/main/java/org/activemq/management/JMSProducerStatsImpl.java
index e70203bb34..cff42349b8 100755
--- a/activemq-core/src/main/java/org/activemq/management/JMSProducerStatsImpl.java
+++ b/activemq-core/src/main/java/org/activemq/management/JMSProducerStatsImpl.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
import javax.jms.Destination;
diff --git a/activemq-core/src/main/java/org/activemq/management/JMSSessionStatsImpl.java b/activemq-core/src/main/java/org/activemq/management/JMSSessionStatsImpl.java
index 9bdb116d52..23993406db 100755
--- a/activemq-core/src/main/java/org/activemq/management/JMSSessionStatsImpl.java
+++ b/activemq-core/src/main/java/org/activemq/management/JMSSessionStatsImpl.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
import java.util.List;
diff --git a/activemq-core/src/main/java/org/activemq/management/JMSStatsImpl.java b/activemq-core/src/main/java/org/activemq/management/JMSStatsImpl.java
index 1ae6e447f9..147169aace 100755
--- a/activemq-core/src/main/java/org/activemq/management/JMSStatsImpl.java
+++ b/activemq-core/src/main/java/org/activemq/management/JMSStatsImpl.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
import java.util.List;
diff --git a/activemq-core/src/main/java/org/activemq/management/PollCountStatisticImpl.java b/activemq-core/src/main/java/org/activemq/management/PollCountStatisticImpl.java
index 4ca4b8c773..f90442b43c 100755
--- a/activemq-core/src/main/java/org/activemq/management/PollCountStatisticImpl.java
+++ b/activemq-core/src/main/java/org/activemq/management/PollCountStatisticImpl.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
import java.util.ArrayList;
diff --git a/activemq-core/src/main/java/org/activemq/management/RangeStatisticImpl.java b/activemq-core/src/main/java/org/activemq/management/RangeStatisticImpl.java
index 5d5acbb6eb..a02ac0d343 100755
--- a/activemq-core/src/main/java/org/activemq/management/RangeStatisticImpl.java
+++ b/activemq-core/src/main/java/org/activemq/management/RangeStatisticImpl.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
diff --git a/activemq-core/src/main/java/org/activemq/management/Resettable.java b/activemq-core/src/main/java/org/activemq/management/Resettable.java
index 65a8b2874d..d9362061dd 100755
--- a/activemq-core/src/main/java/org/activemq/management/Resettable.java
+++ b/activemq-core/src/main/java/org/activemq/management/Resettable.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
/**
diff --git a/activemq-core/src/main/java/org/activemq/management/StatisticImpl.java b/activemq-core/src/main/java/org/activemq/management/StatisticImpl.java
index 965453ba33..91c13c3ada 100755
--- a/activemq-core/src/main/java/org/activemq/management/StatisticImpl.java
+++ b/activemq-core/src/main/java/org/activemq/management/StatisticImpl.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
import javax.management.j2ee.statistics.Statistic;
diff --git a/activemq-core/src/main/java/org/activemq/management/StatsCapable.java b/activemq-core/src/main/java/org/activemq/management/StatsCapable.java
index 01c053b8e3..a8d6d6926b 100755
--- a/activemq-core/src/main/java/org/activemq/management/StatsCapable.java
+++ b/activemq-core/src/main/java/org/activemq/management/StatsCapable.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
diff --git a/activemq-core/src/main/java/org/activemq/management/StatsImpl.java b/activemq-core/src/main/java/org/activemq/management/StatsImpl.java
index 1f60cc18b6..21f8e1bfcc 100755
--- a/activemq-core/src/main/java/org/activemq/management/StatsImpl.java
+++ b/activemq-core/src/main/java/org/activemq/management/StatsImpl.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
import java.util.*;
diff --git a/activemq-core/src/main/java/org/activemq/management/TimeStatisticImpl.java b/activemq-core/src/main/java/org/activemq/management/TimeStatisticImpl.java
index f66cb5e3db..742e485530 100755
--- a/activemq-core/src/main/java/org/activemq/management/TimeStatisticImpl.java
+++ b/activemq-core/src/main/java/org/activemq/management/TimeStatisticImpl.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
diff --git a/activemq-core/src/main/java/org/activemq/memory/Cache.java b/activemq-core/src/main/java/org/activemq/memory/Cache.java
index 219f81ed9f..c7e3db3114 100755
--- a/activemq-core/src/main/java/org/activemq/memory/Cache.java
+++ b/activemq-core/src/main/java/org/activemq/memory/Cache.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.memory;
diff --git a/activemq-core/src/main/java/org/activemq/memory/CacheEntry.java b/activemq-core/src/main/java/org/activemq/memory/CacheEntry.java
index dc60524d6e..12f5585637 100755
--- a/activemq-core/src/main/java/org/activemq/memory/CacheEntry.java
+++ b/activemq-core/src/main/java/org/activemq/memory/CacheEntry.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
-
+ * 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.memory;
public class CacheEntry {
diff --git a/activemq-core/src/main/java/org/activemq/memory/CacheEntryList.java b/activemq-core/src/main/java/org/activemq/memory/CacheEntryList.java
index 71299bd5cc..f65e5bc561 100755
--- a/activemq-core/src/main/java/org/activemq/memory/CacheEntryList.java
+++ b/activemq-core/src/main/java/org/activemq/memory/CacheEntryList.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activemq.memory;
/**
diff --git a/activemq-core/src/main/java/org/activemq/memory/CacheEvictionUsageListener.java b/activemq-core/src/main/java/org/activemq/memory/CacheEvictionUsageListener.java
index 1e7e07a585..5d7baff72c 100755
--- a/activemq-core/src/main/java/org/activemq/memory/CacheEvictionUsageListener.java
+++ b/activemq-core/src/main/java/org/activemq/memory/CacheEvictionUsageListener.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activemq.memory;
import java.util.Iterator;
diff --git a/activemq-core/src/main/java/org/activemq/memory/CacheEvictor.java b/activemq-core/src/main/java/org/activemq/memory/CacheEvictor.java
index 110138a33e..375d34029e 100755
--- a/activemq-core/src/main/java/org/activemq/memory/CacheEvictor.java
+++ b/activemq-core/src/main/java/org/activemq/memory/CacheEvictor.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activemq.memory;
public interface CacheEvictor {
diff --git a/activemq-core/src/main/java/org/activemq/memory/CacheFilter.java b/activemq-core/src/main/java/org/activemq/memory/CacheFilter.java
index 148e94b510..c268f0bcc5 100755
--- a/activemq-core/src/main/java/org/activemq/memory/CacheFilter.java
+++ b/activemq-core/src/main/java/org/activemq/memory/CacheFilter.java
@@ -1,3 +1,20 @@
+
+/**
+ *
+ * Copyright 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.
+ */
package org.activemq.memory;
diff --git a/activemq-core/src/main/java/org/activemq/memory/LRUMap.java b/activemq-core/src/main/java/org/activemq/memory/LRUMap.java
index 64b18ba5d0..eadd7ace8c 100755
--- a/activemq-core/src/main/java/org/activemq/memory/LRUMap.java
+++ b/activemq-core/src/main/java/org/activemq/memory/LRUMap.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.memory;
import java.util.LinkedHashMap;
diff --git a/activemq-core/src/main/java/org/activemq/memory/MapCache.java b/activemq-core/src/main/java/org/activemq/memory/MapCache.java
index f2e03a53bb..56db054060 100755
--- a/activemq-core/src/main/java/org/activemq/memory/MapCache.java
+++ b/activemq-core/src/main/java/org/activemq/memory/MapCache.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activemq.memory;
import java.util.Map;
diff --git a/activemq-core/src/main/java/org/activemq/memory/UsageListener.java b/activemq-core/src/main/java/org/activemq/memory/UsageListener.java
index c8dab588f9..707d468fa9 100755
--- a/activemq-core/src/main/java/org/activemq/memory/UsageListener.java
+++ b/activemq-core/src/main/java/org/activemq/memory/UsageListener.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.memory;
public interface UsageListener {
diff --git a/activemq-core/src/main/java/org/activemq/memory/UsageManager.java b/activemq-core/src/main/java/org/activemq/memory/UsageManager.java
index 776223aa1a..5d6a018c84 100755
--- a/activemq-core/src/main/java/org/activemq/memory/UsageManager.java
+++ b/activemq-core/src/main/java/org/activemq/memory/UsageManager.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.memory;
import java.util.Iterator;
diff --git a/activemq-core/src/main/java/org/activemq/memory/UsageManagerCacheFilter.java b/activemq-core/src/main/java/org/activemq/memory/UsageManagerCacheFilter.java
index 5de1795f3a..c20a1c49cb 100755
--- a/activemq-core/src/main/java/org/activemq/memory/UsageManagerCacheFilter.java
+++ b/activemq-core/src/main/java/org/activemq/memory/UsageManagerCacheFilter.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activemq.memory;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong;
diff --git a/activemq-core/src/main/java/org/activemq/memory/buffer/MessageBuffer.java b/activemq-core/src/main/java/org/activemq/memory/buffer/MessageBuffer.java
index 6700d4784d..40b7bc84f9 100644
--- a/activemq-core/src/main/java/org/activemq/memory/buffer/MessageBuffer.java
+++ b/activemq-core/src/main/java/org/activemq/memory/buffer/MessageBuffer.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.memory.buffer;
diff --git a/activemq-core/src/main/java/org/activemq/memory/buffer/MessageQueue.java b/activemq-core/src/main/java/org/activemq/memory/buffer/MessageQueue.java
index 377a62b9ee..ef94011b6a 100644
--- a/activemq-core/src/main/java/org/activemq/memory/buffer/MessageQueue.java
+++ b/activemq-core/src/main/java/org/activemq/memory/buffer/MessageQueue.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.memory.buffer;
import org.activemq.broker.region.MessageReference;
diff --git a/activemq-core/src/main/java/org/activemq/memory/buffer/OrderBasedMessageBuffer.java b/activemq-core/src/main/java/org/activemq/memory/buffer/OrderBasedMessageBuffer.java
index fd822e947a..f1f99b313f 100644
--- a/activemq-core/src/main/java/org/activemq/memory/buffer/OrderBasedMessageBuffer.java
+++ b/activemq-core/src/main/java/org/activemq/memory/buffer/OrderBasedMessageBuffer.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.memory.buffer;
import java.util.Iterator;
diff --git a/activemq-core/src/main/java/org/activemq/memory/buffer/SizeBasedMessageBuffer.java b/activemq-core/src/main/java/org/activemq/memory/buffer/SizeBasedMessageBuffer.java
index 04cb099af2..2e91d7bd5a 100644
--- a/activemq-core/src/main/java/org/activemq/memory/buffer/SizeBasedMessageBuffer.java
+++ b/activemq-core/src/main/java/org/activemq/memory/buffer/SizeBasedMessageBuffer.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.memory.buffer;
import java.util.ArrayList;
diff --git a/activemq-core/src/main/java/org/activemq/memory/list/DestinationBasedMessageList.java b/activemq-core/src/main/java/org/activemq/memory/list/DestinationBasedMessageList.java
index 44a339e12c..d76f5aac02 100644
--- a/activemq-core/src/main/java/org/activemq/memory/list/DestinationBasedMessageList.java
+++ b/activemq-core/src/main/java/org/activemq/memory/list/DestinationBasedMessageList.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.memory.list;
import java.util.ArrayList;
diff --git a/activemq-core/src/main/java/org/activemq/memory/list/MessageList.java b/activemq-core/src/main/java/org/activemq/memory/list/MessageList.java
index 84d1aa873a..57004c37ee 100644
--- a/activemq-core/src/main/java/org/activemq/memory/list/MessageList.java
+++ b/activemq-core/src/main/java/org/activemq/memory/list/MessageList.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.memory.list;
import org.activemq.broker.region.MessageReference;
diff --git a/activemq-core/src/main/java/org/activemq/memory/list/SimpleMessageList.java b/activemq-core/src/main/java/org/activemq/memory/list/SimpleMessageList.java
index 7f90aecd9b..52b1d18d1e 100644
--- a/activemq-core/src/main/java/org/activemq/memory/list/SimpleMessageList.java
+++ b/activemq-core/src/main/java/org/activemq/memory/list/SimpleMessageList.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.memory.list;
import org.activemq.broker.region.MessageReference;
diff --git a/activemq-core/src/main/java/org/activemq/network/Bridge.java b/activemq-core/src/main/java/org/activemq/network/Bridge.java
index 52a23e3bf6..e8c8347107 100644
--- a/activemq-core/src/main/java/org/activemq/network/Bridge.java
+++ b/activemq-core/src/main/java/org/activemq/network/Bridge.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.network;
import org.activemq.Service;
diff --git a/activemq-core/src/main/java/org/activemq/network/DemandForwardingBridge.java b/activemq-core/src/main/java/org/activemq/network/DemandForwardingBridge.java
index 5ba7246dcf..116ac81e7f 100755
--- a/activemq-core/src/main/java/org/activemq/network/DemandForwardingBridge.java
+++ b/activemq-core/src/main/java/org/activemq/network/DemandForwardingBridge.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.network;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/network/ForwardingBridge.java b/activemq-core/src/main/java/org/activemq/network/ForwardingBridge.java
index 32ff75ffee..ee2009dc65 100755
--- a/activemq-core/src/main/java/org/activemq/network/ForwardingBridge.java
+++ b/activemq-core/src/main/java/org/activemq/network/ForwardingBridge.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.network;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/network/NetworkConnector.java b/activemq-core/src/main/java/org/activemq/network/NetworkConnector.java
index 567758785f..f57b42d5ec 100644
--- a/activemq-core/src/main/java/org/activemq/network/NetworkConnector.java
+++ b/activemq-core/src/main/java/org/activemq/network/NetworkConnector.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.network;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/network/jms/DestinationBridge.java b/activemq-core/src/main/java/org/activemq/network/jms/DestinationBridge.java
index f5715cafa9..6ff5396695 100755
--- a/activemq-core/src/main/java/org/activemq/network/jms/DestinationBridge.java
+++ b/activemq-core/src/main/java/org/activemq/network/jms/DestinationBridge.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.network.jms;
diff --git a/activemq-core/src/main/java/org/activemq/network/jms/InboundQueueBridge.java b/activemq-core/src/main/java/org/activemq/network/jms/InboundQueueBridge.java
index d604376983..e330a95fcd 100755
--- a/activemq-core/src/main/java/org/activemq/network/jms/InboundQueueBridge.java
+++ b/activemq-core/src/main/java/org/activemq/network/jms/InboundQueueBridge.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.network.jms;
diff --git a/activemq-core/src/main/java/org/activemq/network/jms/InboundTopicBridge.java b/activemq-core/src/main/java/org/activemq/network/jms/InboundTopicBridge.java
index 76da770bd4..ab44cd8851 100755
--- a/activemq-core/src/main/java/org/activemq/network/jms/InboundTopicBridge.java
+++ b/activemq-core/src/main/java/org/activemq/network/jms/InboundTopicBridge.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.network.jms;
diff --git a/activemq-core/src/main/java/org/activemq/network/jms/JmsConnector.java b/activemq-core/src/main/java/org/activemq/network/jms/JmsConnector.java
index 177dac9ff6..6756e6d817 100755
--- a/activemq-core/src/main/java/org/activemq/network/jms/JmsConnector.java
+++ b/activemq-core/src/main/java/org/activemq/network/jms/JmsConnector.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.network.jms;
diff --git a/activemq-core/src/main/java/org/activemq/network/jms/JmsMesageConvertor.java b/activemq-core/src/main/java/org/activemq/network/jms/JmsMesageConvertor.java
index dbc6bcfb26..70364fea50 100755
--- a/activemq-core/src/main/java/org/activemq/network/jms/JmsMesageConvertor.java
+++ b/activemq-core/src/main/java/org/activemq/network/jms/JmsMesageConvertor.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.network.jms;
diff --git a/activemq-core/src/main/java/org/activemq/network/jms/JmsQueueConnector.java b/activemq-core/src/main/java/org/activemq/network/jms/JmsQueueConnector.java
index 19c502ce0b..ef7c67d1b9 100755
--- a/activemq-core/src/main/java/org/activemq/network/jms/JmsQueueConnector.java
+++ b/activemq-core/src/main/java/org/activemq/network/jms/JmsQueueConnector.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.network.jms;
diff --git a/activemq-core/src/main/java/org/activemq/network/jms/JmsTopicConnector.java b/activemq-core/src/main/java/org/activemq/network/jms/JmsTopicConnector.java
index 76dfd6f4ce..c2b76035d3 100755
--- a/activemq-core/src/main/java/org/activemq/network/jms/JmsTopicConnector.java
+++ b/activemq-core/src/main/java/org/activemq/network/jms/JmsTopicConnector.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.network.jms;
diff --git a/activemq-core/src/main/java/org/activemq/network/jms/OutboundQueueBridge.java b/activemq-core/src/main/java/org/activemq/network/jms/OutboundQueueBridge.java
index 88b9ef6640..e25bdf8a16 100755
--- a/activemq-core/src/main/java/org/activemq/network/jms/OutboundQueueBridge.java
+++ b/activemq-core/src/main/java/org/activemq/network/jms/OutboundQueueBridge.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.network.jms;
diff --git a/activemq-core/src/main/java/org/activemq/network/jms/OutboundTopicBridge.java b/activemq-core/src/main/java/org/activemq/network/jms/OutboundTopicBridge.java
index f46f371c6f..290654009d 100755
--- a/activemq-core/src/main/java/org/activemq/network/jms/OutboundTopicBridge.java
+++ b/activemq-core/src/main/java/org/activemq/network/jms/OutboundTopicBridge.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.network.jms;
diff --git a/activemq-core/src/main/java/org/activemq/network/jms/QueueBridge.java b/activemq-core/src/main/java/org/activemq/network/jms/QueueBridge.java
index fba4a4e77f..aa9581bdbe 100755
--- a/activemq-core/src/main/java/org/activemq/network/jms/QueueBridge.java
+++ b/activemq-core/src/main/java/org/activemq/network/jms/QueueBridge.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.network.jms;
diff --git a/activemq-core/src/main/java/org/activemq/network/jms/SimpleJmsMessageConvertor.java b/activemq-core/src/main/java/org/activemq/network/jms/SimpleJmsMessageConvertor.java
index 38152aa9c9..dde0b8e9f2 100755
--- a/activemq-core/src/main/java/org/activemq/network/jms/SimpleJmsMessageConvertor.java
+++ b/activemq-core/src/main/java/org/activemq/network/jms/SimpleJmsMessageConvertor.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.network.jms;
diff --git a/activemq-core/src/main/java/org/activemq/network/jms/TopicBridge.java b/activemq-core/src/main/java/org/activemq/network/jms/TopicBridge.java
index 1b96202f41..34ef958c0a 100755
--- a/activemq-core/src/main/java/org/activemq/network/jms/TopicBridge.java
+++ b/activemq-core/src/main/java/org/activemq/network/jms/TopicBridge.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.network.jms;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/BooleanStream.java b/activemq-core/src/main/java/org/activemq/openwire/BooleanStream.java
index 67db5a1c85..09da45697b 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/BooleanStream.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/BooleanStream.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.openwire;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/DataStreamMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/DataStreamMarshaller.java
index f1bdf7b1db..2924039fd4 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/DataStreamMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/DataStreamMarshaller.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.openwire;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/OpenWireFormat.java b/activemq-core/src/main/java/org/activemq/openwire/OpenWireFormat.java
index 1e900c9be9..ac7d8214c2 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/OpenWireFormat.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/OpenWireFormat.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.openwire;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/OpenWireFormatFactory.java b/activemq-core/src/main/java/org/activemq/openwire/OpenWireFormatFactory.java
index 75206a091c..868fbabfd4 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/OpenWireFormatFactory.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/OpenWireFormatFactory.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.openwire;
import org.activeio.command.WireFormat;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java
index d9a7b7706e..bd9df3b5e0 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQDestinationMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQDestinationMarshaller.java
index ad7ec1c817..77c10249ea 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQDestinationMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQDestinationMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java
index 27b92f6679..c5d6084300 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQMessageMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQMessageMarshaller.java
index 4eb50c3d7c..96c62a630f 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQMessageMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQMessageMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java
index f9e5e5756e..1501b6a8b9 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQQueueMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQQueueMarshaller.java
index f6cabdcb73..a2fbc8b52b 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQQueueMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQQueueMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java
index 4933d12554..b01374ef2a 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java
index 23d2825bc7..3e2a7de7ee 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java
index 9dd53b2f95..c3e81e51be 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java
index 4b77ee9f4f..2c4096d894 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java
index f3153784ee..20b6542328 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTopicMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTopicMarshaller.java
index 0cf7724315..1421f95642 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTopicMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/ActiveMQTopicMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/BaseCommandMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/BaseCommandMarshaller.java
index 75844d3d01..abafb50f5a 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/BaseCommandMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/BaseCommandMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/BrokerIdMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/BrokerIdMarshaller.java
index f8c3e521b6..445d86f142 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/BrokerIdMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/BrokerIdMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/BrokerInfoMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/BrokerInfoMarshaller.java
index 3f3aa27c82..42bfff774c 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/BrokerInfoMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/BrokerInfoMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ConnectionIdMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/ConnectionIdMarshaller.java
index 186e892a26..e3ed6a4a2e 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/ConnectionIdMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/ConnectionIdMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ConnectionInfoMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/ConnectionInfoMarshaller.java
index 099ebef923..f05b9c5fb6 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/ConnectionInfoMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/ConnectionInfoMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ConsumerIdMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/ConsumerIdMarshaller.java
index c9303a66a5..61df92888d 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/ConsumerIdMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/ConsumerIdMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ConsumerInfoMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/ConsumerInfoMarshaller.java
index 9bc106c288..2c300cb1b3 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/ConsumerInfoMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/ConsumerInfoMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ControlCommandMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/ControlCommandMarshaller.java
index d3d9825a11..ee9d391135 100644
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/ControlCommandMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/ControlCommandMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/DataArrayResponseMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/DataArrayResponseMarshaller.java
index 6c911f475f..f544debd74 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/DataArrayResponseMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/DataArrayResponseMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/DataResponseMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/DataResponseMarshaller.java
index d0487bb891..0f19cf6961 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/DataResponseMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/DataResponseMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/DestinationInfoMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/DestinationInfoMarshaller.java
index 9a2c4d8b0b..8e3764c349 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/DestinationInfoMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/DestinationInfoMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ExceptionResponseMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/ExceptionResponseMarshaller.java
index 1abea7fba8..3885e14863 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/ExceptionResponseMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/ExceptionResponseMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/FlushCommandMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/FlushCommandMarshaller.java
index b1c3c186d8..88c3b2ac3b 100644
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/FlushCommandMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/FlushCommandMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/IntegerResponseMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/IntegerResponseMarshaller.java
index 9563c4d0d3..e0fbb641d2 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/IntegerResponseMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/IntegerResponseMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/JournalQueueAckMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/JournalQueueAckMarshaller.java
index 448fa6a22e..dda6ad06b9 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/JournalQueueAckMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/JournalQueueAckMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/JournalTopicAckMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/JournalTopicAckMarshaller.java
index 5cc9c33f98..116e8d1c1b 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/JournalTopicAckMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/JournalTopicAckMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/JournalTraceMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/JournalTraceMarshaller.java
index 6ae4471c92..9f76c3b2ee 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/JournalTraceMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/JournalTraceMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/JournalTransactionMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/JournalTransactionMarshaller.java
index c5ccf2e99f..1c224910ab 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/JournalTransactionMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/JournalTransactionMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/KeepAliveInfoMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/KeepAliveInfoMarshaller.java
index 9014824f20..4022a2b64d 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/KeepAliveInfoMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/KeepAliveInfoMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/LocalTransactionIdMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/LocalTransactionIdMarshaller.java
index 2dd65c964a..b71c798560 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/LocalTransactionIdMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/LocalTransactionIdMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/MarshallerFactory.java b/activemq-core/src/main/java/org/activemq/openwire/v1/MarshallerFactory.java
index d3198eab11..e74a8643a9 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/MarshallerFactory.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/MarshallerFactory.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import org.activemq.openwire.DataStreamMarshaller;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/MessageAckMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/MessageAckMarshaller.java
index 8647c75041..08cecad9b7 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/MessageAckMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/MessageAckMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/MessageDispatchMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/MessageDispatchMarshaller.java
index 6636c4eee5..89d3674e34 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/MessageDispatchMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/MessageDispatchMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/MessageIdMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/MessageIdMarshaller.java
index c19c9a840d..7a3c9d3467 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/MessageIdMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/MessageIdMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/MessageMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/MessageMarshaller.java
index 2ead9913c5..acdb90fef5 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/MessageMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/MessageMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ProducerIdMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/ProducerIdMarshaller.java
index f833f74c3f..6babda3bb6 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/ProducerIdMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/ProducerIdMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ProducerInfoMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/ProducerInfoMarshaller.java
index 92199cfdb2..bf5a25e4e1 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/ProducerInfoMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/ProducerInfoMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/RedeliveryPolicyMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/RedeliveryPolicyMarshaller.java
index 4a098526c6..5d98ce1210 100644
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/RedeliveryPolicyMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/RedeliveryPolicyMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/RemoveInfoMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/RemoveInfoMarshaller.java
index ff86420385..c601435442 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/RemoveInfoMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/RemoveInfoMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java
index cca8782453..7a2bdc49c6 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ResponseMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/ResponseMarshaller.java
index 84030d368e..b574a74702 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/ResponseMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/ResponseMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/SessionIdMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/SessionIdMarshaller.java
index 4397b7d935..2594725f24 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/SessionIdMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/SessionIdMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/SessionInfoMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/SessionInfoMarshaller.java
index d9a92a5587..e2bfba79f4 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/SessionInfoMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/SessionInfoMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/ShutdownInfoMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/ShutdownInfoMarshaller.java
index 5cc01c12cd..614b83e264 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/ShutdownInfoMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/ShutdownInfoMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/SubscriptionInfoMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/SubscriptionInfoMarshaller.java
index 5201a4171d..4c8c245bbf 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/SubscriptionInfoMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/SubscriptionInfoMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/TransactionIdMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/TransactionIdMarshaller.java
index d1993e9b79..759fd182f3 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/TransactionIdMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/TransactionIdMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/TransactionInfoMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/TransactionInfoMarshaller.java
index d5b0c74a21..d7447176f5 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/TransactionInfoMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/TransactionInfoMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/WireFormatInfoMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/WireFormatInfoMarshaller.java
index 24077d50c1..00118d4240 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/WireFormatInfoMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/WireFormatInfoMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/openwire/v1/XATransactionIdMarshaller.java b/activemq-core/src/main/java/org/activemq/openwire/v1/XATransactionIdMarshaller.java
index 1e43d6dc1c..b465c6ee46 100755
--- a/activemq-core/src/main/java/org/activemq/openwire/v1/XATransactionIdMarshaller.java
+++ b/activemq-core/src/main/java/org/activemq/openwire/v1/XATransactionIdMarshaller.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- * Copyright 2005 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.openwire.v1;
import java.io.DataInputStream;
diff --git a/activemq-core/src/main/java/org/activemq/pool/ConnectionKey.java b/activemq-core/src/main/java/org/activemq/pool/ConnectionKey.java
index 4115d3217a..548c15c444 100644
--- a/activemq-core/src/main/java/org/activemq/pool/ConnectionKey.java
+++ b/activemq-core/src/main/java/org/activemq/pool/ConnectionKey.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.pool;
/**
diff --git a/activemq-core/src/main/java/org/activemq/pool/ConnectionPool.java b/activemq-core/src/main/java/org/activemq/pool/ConnectionPool.java
index 1e4fbcf981..70b4eb8fb8 100644
--- a/activemq-core/src/main/java/org/activemq/pool/ConnectionPool.java
+++ b/activemq-core/src/main/java/org/activemq/pool/ConnectionPool.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.pool;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
diff --git a/activemq-core/src/main/java/org/activemq/pool/PooledConnection.java b/activemq-core/src/main/java/org/activemq/pool/PooledConnection.java
index 648cfbe8ae..6eeec486df 100755
--- a/activemq-core/src/main/java/org/activemq/pool/PooledConnection.java
+++ b/activemq-core/src/main/java/org/activemq/pool/PooledConnection.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.pool;
import org.activemq.ActiveMQConnection;
diff --git a/activemq-core/src/main/java/org/activemq/pool/PooledConnectionFactory.java b/activemq-core/src/main/java/org/activemq/pool/PooledConnectionFactory.java
index 32cdc048c6..d4e9e557d8 100644
--- a/activemq-core/src/main/java/org/activemq/pool/PooledConnectionFactory.java
+++ b/activemq-core/src/main/java/org/activemq/pool/PooledConnectionFactory.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.pool;
import org.activemq.ActiveMQConnection;
diff --git a/activemq-core/src/main/java/org/activemq/pool/PooledProducer.java b/activemq-core/src/main/java/org/activemq/pool/PooledProducer.java
index 34a0bf766c..f6bc92b466 100644
--- a/activemq-core/src/main/java/org/activemq/pool/PooledProducer.java
+++ b/activemq-core/src/main/java/org/activemq/pool/PooledProducer.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.pool;
import org.activemq.ActiveMQMessageProducer;
diff --git a/activemq-core/src/main/java/org/activemq/pool/PooledQueueSender.java b/activemq-core/src/main/java/org/activemq/pool/PooledQueueSender.java
index 4de17d29ca..e67d034a1d 100644
--- a/activemq-core/src/main/java/org/activemq/pool/PooledQueueSender.java
+++ b/activemq-core/src/main/java/org/activemq/pool/PooledQueueSender.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.pool;
import org.activemq.ActiveMQQueueSender;
diff --git a/activemq-core/src/main/java/org/activemq/pool/PooledSession.java b/activemq-core/src/main/java/org/activemq/pool/PooledSession.java
index 9f6a6d7a4a..3b5a6d4767 100644
--- a/activemq-core/src/main/java/org/activemq/pool/PooledSession.java
+++ b/activemq-core/src/main/java/org/activemq/pool/PooledSession.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.pool;
import org.activemq.ActiveMQMessageProducer;
diff --git a/activemq-core/src/main/java/org/activemq/pool/PooledTopicPublisher.java b/activemq-core/src/main/java/org/activemq/pool/PooledTopicPublisher.java
index 65e949ae93..88db4aaf1e 100644
--- a/activemq-core/src/main/java/org/activemq/pool/PooledTopicPublisher.java
+++ b/activemq-core/src/main/java/org/activemq/pool/PooledTopicPublisher.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.pool;
import org.activemq.ActiveMQTopicPublisher;
diff --git a/activemq-core/src/main/java/org/activemq/pool/SessionKey.java b/activemq-core/src/main/java/org/activemq/pool/SessionKey.java
index 7f9e48e073..546bf86136 100644
--- a/activemq-core/src/main/java/org/activemq/pool/SessionKey.java
+++ b/activemq-core/src/main/java/org/activemq/pool/SessionKey.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.pool;
/**
diff --git a/activemq-core/src/main/java/org/activemq/pool/SessionPool.java b/activemq-core/src/main/java/org/activemq/pool/SessionPool.java
index 774b181ce5..5ffcca03a7 100644
--- a/activemq-core/src/main/java/org/activemq/pool/SessionPool.java
+++ b/activemq-core/src/main/java/org/activemq/pool/SessionPool.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.pool;
import org.activemq.ActiveMQConnection;
diff --git a/activemq-core/src/main/java/org/activemq/proxy/ProxyConnection.java b/activemq-core/src/main/java/org/activemq/proxy/ProxyConnection.java
index 382bab4ea4..7af001f245 100644
--- a/activemq-core/src/main/java/org/activemq/proxy/ProxyConnection.java
+++ b/activemq-core/src/main/java/org/activemq/proxy/ProxyConnection.java
@@ -1,22 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
-
+ * 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.proxy;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/proxy/ProxyConnector.java b/activemq-core/src/main/java/org/activemq/proxy/ProxyConnector.java
index cacfcb1a18..8117c7758f 100644
--- a/activemq-core/src/main/java/org/activemq/proxy/ProxyConnector.java
+++ b/activemq-core/src/main/java/org/activemq/proxy/ProxyConnector.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.proxy;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/security/JaasAuthenticationBroker.java b/activemq-core/src/main/java/org/activemq/security/JaasAuthenticationBroker.java
index 40550af944..04c02b90d0 100644
--- a/activemq-core/src/main/java/org/activemq/security/JaasAuthenticationBroker.java
+++ b/activemq-core/src/main/java/org/activemq/security/JaasAuthenticationBroker.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.security;
import java.util.Iterator;
diff --git a/activemq-core/src/main/java/org/activemq/security/JassCredentialCallback.java b/activemq-core/src/main/java/org/activemq/security/JassCredentialCallback.java
index 3c3cc85caa..05c5ff300d 100644
--- a/activemq-core/src/main/java/org/activemq/security/JassCredentialCallback.java
+++ b/activemq-core/src/main/java/org/activemq/security/JassCredentialCallback.java
@@ -2,17 +2,17 @@
*
* Copyright 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
+ * 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.
*/
package org.activemq.security;
diff --git a/activemq-core/src/main/java/org/activemq/security/SecurityAdminMBean.java b/activemq-core/src/main/java/org/activemq/security/SecurityAdminMBean.java
index 1c08123e0e..8385421b2c 100644
--- a/activemq-core/src/main/java/org/activemq/security/SecurityAdminMBean.java
+++ b/activemq-core/src/main/java/org/activemq/security/SecurityAdminMBean.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.security;
/**
diff --git a/activemq-core/src/main/java/org/activemq/security/SecurityContext.java b/activemq-core/src/main/java/org/activemq/security/SecurityContext.java
index 720e8a440d..63693535c1 100644
--- a/activemq-core/src/main/java/org/activemq/security/SecurityContext.java
+++ b/activemq-core/src/main/java/org/activemq/security/SecurityContext.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activemq.security;
import java.util.HashSet;
diff --git a/activemq-core/src/main/java/org/activemq/security/SimpleAuthenticationBroker.java b/activemq-core/src/main/java/org/activemq/security/SimpleAuthenticationBroker.java
index 306c0f78c7..bf5b0664ae 100644
--- a/activemq-core/src/main/java/org/activemq/security/SimpleAuthenticationBroker.java
+++ b/activemq-core/src/main/java/org/activemq/security/SimpleAuthenticationBroker.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.security;
import java.util.Iterator;
diff --git a/activemq-core/src/main/java/org/activemq/security/SimpleAuthorizationBroker.java b/activemq-core/src/main/java/org/activemq/security/SimpleAuthorizationBroker.java
index b7aed2e5ec..da8a83740b 100644
--- a/activemq-core/src/main/java/org/activemq/security/SimpleAuthorizationBroker.java
+++ b/activemq-core/src/main/java/org/activemq/security/SimpleAuthorizationBroker.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.security;
import org.activemq.broker.Broker;
diff --git a/activemq-core/src/main/java/org/activemq/state/CommandVisitor.java b/activemq-core/src/main/java/org/activemq/state/CommandVisitor.java
index 86cde102d1..1922cab800 100755
--- a/activemq-core/src/main/java/org/activemq/state/CommandVisitor.java
+++ b/activemq-core/src/main/java/org/activemq/state/CommandVisitor.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.state;
import org.activemq.command.BrokerInfo;
diff --git a/activemq-core/src/main/java/org/activemq/state/ConnectionState.java b/activemq-core/src/main/java/org/activemq/state/ConnectionState.java
index c13cc9127a..701e6cd4e0 100755
--- a/activemq-core/src/main/java/org/activemq/state/ConnectionState.java
+++ b/activemq-core/src/main/java/org/activemq/state/ConnectionState.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.state;
diff --git a/activemq-core/src/main/java/org/activemq/state/ConnectionStateTracker.java b/activemq-core/src/main/java/org/activemq/state/ConnectionStateTracker.java
index 54221408ca..bc5a78829b 100755
--- a/activemq-core/src/main/java/org/activemq/state/ConnectionStateTracker.java
+++ b/activemq-core/src/main/java/org/activemq/state/ConnectionStateTracker.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.state;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/state/ConsumerState.java b/activemq-core/src/main/java/org/activemq/state/ConsumerState.java
index 9fc9f6dd6a..b9f1aed4bb 100755
--- a/activemq-core/src/main/java/org/activemq/state/ConsumerState.java
+++ b/activemq-core/src/main/java/org/activemq/state/ConsumerState.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.state;
diff --git a/activemq-core/src/main/java/org/activemq/state/ProducerState.java b/activemq-core/src/main/java/org/activemq/state/ProducerState.java
index 998fdd1c42..1947280a10 100755
--- a/activemq-core/src/main/java/org/activemq/state/ProducerState.java
+++ b/activemq-core/src/main/java/org/activemq/state/ProducerState.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.state;
diff --git a/activemq-core/src/main/java/org/activemq/state/SessionState.java b/activemq-core/src/main/java/org/activemq/state/SessionState.java
index bd546993f5..df4482f388 100755
--- a/activemq-core/src/main/java/org/activemq/state/SessionState.java
+++ b/activemq-core/src/main/java/org/activemq/state/SessionState.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.state;
diff --git a/activemq-core/src/main/java/org/activemq/store/DefaultPersistenceAdapterFactory.java b/activemq-core/src/main/java/org/activemq/store/DefaultPersistenceAdapterFactory.java
index d7e8dc0d23..e5db51a286 100755
--- a/activemq-core/src/main/java/org/activemq/store/DefaultPersistenceAdapterFactory.java
+++ b/activemq-core/src/main/java/org/activemq/store/DefaultPersistenceAdapterFactory.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store;
import java.io.File;
diff --git a/activemq-core/src/main/java/org/activemq/store/MessageRecoveryListener.java b/activemq-core/src/main/java/org/activemq/store/MessageRecoveryListener.java
index 209f234354..bb293a6731 100755
--- a/activemq-core/src/main/java/org/activemq/store/MessageRecoveryListener.java
+++ b/activemq-core/src/main/java/org/activemq/store/MessageRecoveryListener.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store;
import org.activemq.command.Message;
diff --git a/activemq-core/src/main/java/org/activemq/store/MessageStore.java b/activemq-core/src/main/java/org/activemq/store/MessageStore.java
index 8402d7d068..6da0fe4795 100755
--- a/activemq-core/src/main/java/org/activemq/store/MessageStore.java
+++ b/activemq-core/src/main/java/org/activemq/store/MessageStore.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/store/PersistenceAdapter.java b/activemq-core/src/main/java/org/activemq/store/PersistenceAdapter.java
index c330a6d26c..212661e913 100755
--- a/activemq-core/src/main/java/org/activemq/store/PersistenceAdapter.java
+++ b/activemq-core/src/main/java/org/activemq/store/PersistenceAdapter.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store;
import org.activemq.Service;
diff --git a/activemq-core/src/main/java/org/activemq/store/PersistenceAdapterFactory.java b/activemq-core/src/main/java/org/activemq/store/PersistenceAdapterFactory.java
index 3baed46c12..3e66b8450a 100755
--- a/activemq-core/src/main/java/org/activemq/store/PersistenceAdapterFactory.java
+++ b/activemq-core/src/main/java/org/activemq/store/PersistenceAdapterFactory.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/store/PersistenceAdapterFactoryBean.java b/activemq-core/src/main/java/org/activemq/store/PersistenceAdapterFactoryBean.java
index 657e356830..514f857cd0 100644
--- a/activemq-core/src/main/java/org/activemq/store/PersistenceAdapterFactoryBean.java
+++ b/activemq-core/src/main/java/org/activemq/store/PersistenceAdapterFactoryBean.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.store;
import org.springframework.beans.factory.FactoryBean;
diff --git a/activemq-core/src/main/java/org/activemq/store/ProxyMessageStore.java b/activemq-core/src/main/java/org/activemq/store/ProxyMessageStore.java
index 11ce0aae63..3bceabe44b 100755
--- a/activemq-core/src/main/java/org/activemq/store/ProxyMessageStore.java
+++ b/activemq-core/src/main/java/org/activemq/store/ProxyMessageStore.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/store/ProxyTopicMessageStore.java b/activemq-core/src/main/java/org/activemq/store/ProxyTopicMessageStore.java
index 45b15e8c6f..647cfc0873 100755
--- a/activemq-core/src/main/java/org/activemq/store/ProxyTopicMessageStore.java
+++ b/activemq-core/src/main/java/org/activemq/store/ProxyTopicMessageStore.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/store/TopicMessageStore.java b/activemq-core/src/main/java/org/activemq/store/TopicMessageStore.java
index 07f80fb397..e53eb85fc6 100755
--- a/activemq-core/src/main/java/org/activemq/store/TopicMessageStore.java
+++ b/activemq-core/src/main/java/org/activemq/store/TopicMessageStore.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/store/TransactionRecoveryListener.java b/activemq-core/src/main/java/org/activemq/store/TransactionRecoveryListener.java
index d99e14d920..cbdfd71ddb 100755
--- a/activemq-core/src/main/java/org/activemq/store/TransactionRecoveryListener.java
+++ b/activemq-core/src/main/java/org/activemq/store/TransactionRecoveryListener.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store;
import org.activemq.command.Message;
diff --git a/activemq-core/src/main/java/org/activemq/store/TransactionStore.java b/activemq-core/src/main/java/org/activemq/store/TransactionStore.java
index 389b41ad81..f9fb6488d3 100755
--- a/activemq-core/src/main/java/org/activemq/store/TransactionStore.java
+++ b/activemq-core/src/main/java/org/activemq/store/TransactionStore.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCAdapter.java b/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCAdapter.java
index bebac0b82e..58b6e13ccd 100755
--- a/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCAdapter.java
+++ b/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCAdapter.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store.jdbc;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCMessageRecoveryListener.java b/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCMessageRecoveryListener.java
index a8b2009182..8382169931 100755
--- a/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCMessageRecoveryListener.java
+++ b/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCMessageRecoveryListener.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store.jdbc;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCMessageStore.java b/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCMessageStore.java
index d894053457..93229a9f31 100755
--- a/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCMessageStore.java
+++ b/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCMessageStore.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store.jdbc;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCPersistenceAdapter.java b/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCPersistenceAdapter.java
index 0634a34376..b899d1368e 100755
--- a/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCPersistenceAdapter.java
+++ b/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCPersistenceAdapter.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.store.jdbc;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCTopicMessageStore.java b/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCTopicMessageStore.java
index 0a7de2b746..809c93a056 100755
--- a/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCTopicMessageStore.java
+++ b/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCTopicMessageStore.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.store.jdbc;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/StatementProvider.java b/activemq-core/src/main/java/org/activemq/store/jdbc/StatementProvider.java
index 75295830ce..0e2709e7d8 100755
--- a/activemq-core/src/main/java/org/activemq/store/jdbc/StatementProvider.java
+++ b/activemq-core/src/main/java/org/activemq/store/jdbc/StatementProvider.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store.jdbc;
/**
diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/TransactionContext.java b/activemq-core/src/main/java/org/activemq/store/jdbc/TransactionContext.java
index 3848f4b10b..2dad1363d4 100755
--- a/activemq-core/src/main/java/org/activemq/store/jdbc/TransactionContext.java
+++ b/activemq-core/src/main/java/org/activemq/store/jdbc/TransactionContext.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.store.jdbc;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/AxionJDBCAdapter.java b/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/AxionJDBCAdapter.java
index c105c6bb14..06291a5359 100755
--- a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/AxionJDBCAdapter.java
+++ b/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/AxionJDBCAdapter.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store.jdbc.adapter;
import org.activemq.store.jdbc.StatementProvider;
diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/CachingStatementProvider.java b/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/CachingStatementProvider.java
index 6fd076a14d..60f4d5d009 100755
--- a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/CachingStatementProvider.java
+++ b/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/CachingStatementProvider.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store.jdbc.adapter;
import org.activemq.store.jdbc.StatementProvider;
diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java b/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java
index f36398aafa..c16ae6a6b4 100755
--- a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java
+++ b/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store.jdbc.adapter;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/HsqldbJDBCAdapter.java b/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/HsqldbJDBCAdapter.java
index b61dfaaee0..6258fcad9a 100755
--- a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/HsqldbJDBCAdapter.java
+++ b/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/HsqldbJDBCAdapter.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store.jdbc.adapter;
import org.activemq.store.jdbc.StatementProvider;
diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/ImageBasedJDBCAdaptor.java b/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/ImageBasedJDBCAdaptor.java
index 3a1409bb6c..8aa5d489ed 100755
--- a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/ImageBasedJDBCAdaptor.java
+++ b/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/ImageBasedJDBCAdaptor.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store.jdbc.adapter;
import org.activemq.store.jdbc.StatementProvider;
diff --git a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/OracleJDBCAdapter.java b/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/OracleJDBCAdapter.java
index 54742c2064..214c3ad92a 100755
--- a/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/OracleJDBCAdapter.java
+++ b/activemq-core/src/main/java/org/activemq/store/jdbc/adapter/OracleJDBCAdapter.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store.jdbc.adapter;
import java.sql.Blob;
diff --git a/activemq-core/src/main/java/org/activemq/store/journal/JournalMessageStore.java b/activemq-core/src/main/java/org/activemq/store/journal/JournalMessageStore.java
index 16f2a31836..1fdc874454 100755
--- a/activemq-core/src/main/java/org/activemq/store/journal/JournalMessageStore.java
+++ b/activemq-core/src/main/java/org/activemq/store/journal/JournalMessageStore.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store.journal;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/store/journal/JournalPersistenceAdapter.java b/activemq-core/src/main/java/org/activemq/store/journal/JournalPersistenceAdapter.java
index 17db1b1ee5..fff186f785 100755
--- a/activemq-core/src/main/java/org/activemq/store/journal/JournalPersistenceAdapter.java
+++ b/activemq-core/src/main/java/org/activemq/store/journal/JournalPersistenceAdapter.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.store.journal;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/store/journal/JournalTopicMessageStore.java b/activemq-core/src/main/java/org/activemq/store/journal/JournalTopicMessageStore.java
index 3914f589ea..cd6093b773 100755
--- a/activemq-core/src/main/java/org/activemq/store/journal/JournalTopicMessageStore.java
+++ b/activemq-core/src/main/java/org/activemq/store/journal/JournalTopicMessageStore.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store.journal;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/store/journal/JournalTransactionStore.java b/activemq-core/src/main/java/org/activemq/store/journal/JournalTransactionStore.java
index 5f7fee01d1..b113d0a238 100755
--- a/activemq-core/src/main/java/org/activemq/store/journal/JournalTransactionStore.java
+++ b/activemq-core/src/main/java/org/activemq/store/journal/JournalTransactionStore.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store.journal;
diff --git a/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalMessageData.java b/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalMessageData.java
index db95452b42..93a7f7d455 100644
--- a/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalMessageData.java
+++ b/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalMessageData.java
@@ -1,21 +1,19 @@
-/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.store.journal;
diff --git a/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalPersistenceAdapter.java b/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalPersistenceAdapter.java
index 82493f976c..97e85d9c76 100755
--- a/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalPersistenceAdapter.java
+++ b/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalPersistenceAdapter.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.store.journal;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalTopicMessageStore.java b/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalTopicMessageStore.java
index 217d70daef..71ad299cc0 100755
--- a/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalTopicMessageStore.java
+++ b/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalTopicMessageStore.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store.journal;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalTransactionStore.java b/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalTransactionStore.java
index d52fdc8e60..282d043643 100755
--- a/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalTransactionStore.java
+++ b/activemq-core/src/main/java/org/activemq/store/journal/QuickJournalTransactionStore.java
@@ -1,22 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
-
+ *
+ * Copyright 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.
+ */
package org.activemq.store.journal;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/store/memory/MemoryMessageStore.java b/activemq-core/src/main/java/org/activemq/store/memory/MemoryMessageStore.java
index 0929d95adf..dcd82c44aa 100755
--- a/activemq-core/src/main/java/org/activemq/store/memory/MemoryMessageStore.java
+++ b/activemq-core/src/main/java/org/activemq/store/memory/MemoryMessageStore.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store.memory;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/store/memory/MemoryPersistenceAdapter.java b/activemq-core/src/main/java/org/activemq/store/memory/MemoryPersistenceAdapter.java
index 92e46195cc..866204fbee 100755
--- a/activemq-core/src/main/java/org/activemq/store/memory/MemoryPersistenceAdapter.java
+++ b/activemq-core/src/main/java/org/activemq/store/memory/MemoryPersistenceAdapter.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store.memory;
import java.io.File;
diff --git a/activemq-core/src/main/java/org/activemq/store/memory/MemoryTopicMessageStore.java b/activemq-core/src/main/java/org/activemq/store/memory/MemoryTopicMessageStore.java
index 7b53621d3c..172b109f1a 100755
--- a/activemq-core/src/main/java/org/activemq/store/memory/MemoryTopicMessageStore.java
+++ b/activemq-core/src/main/java/org/activemq/store/memory/MemoryTopicMessageStore.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store.memory;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/store/memory/MemoryTransactionStore.java b/activemq-core/src/main/java/org/activemq/store/memory/MemoryTransactionStore.java
index 0fd3f6db68..be3d3b707d 100755
--- a/activemq-core/src/main/java/org/activemq/store/memory/MemoryTransactionStore.java
+++ b/activemq-core/src/main/java/org/activemq/store/memory/MemoryTransactionStore.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.store.memory;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/thread/DefaultThreadPools.java b/activemq-core/src/main/java/org/activemq/thread/DefaultThreadPools.java
index a44d7d4237..1c9e26c861 100755
--- a/activemq-core/src/main/java/org/activemq/thread/DefaultThreadPools.java
+++ b/activemq-core/src/main/java/org/activemq/thread/DefaultThreadPools.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.thread;
import edu.emory.mathcs.backport.java.util.concurrent.Executor;
diff --git a/activemq-core/src/main/java/org/activemq/thread/Scheduler.java b/activemq-core/src/main/java/org/activemq/thread/Scheduler.java
index c61fe9e724..f4ba77fc53 100755
--- a/activemq-core/src/main/java/org/activemq/thread/Scheduler.java
+++ b/activemq-core/src/main/java/org/activemq/thread/Scheduler.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.thread;
import java.util.HashMap;
diff --git a/activemq-core/src/main/java/org/activemq/thread/Task.java b/activemq-core/src/main/java/org/activemq/thread/Task.java
index 6b93b49df4..0eafd05789 100755
--- a/activemq-core/src/main/java/org/activemq/thread/Task.java
+++ b/activemq-core/src/main/java/org/activemq/thread/Task.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.thread;
/**
diff --git a/activemq-core/src/main/java/org/activemq/thread/TaskRunner.java b/activemq-core/src/main/java/org/activemq/thread/TaskRunner.java
index 82932449d5..15b4656966 100755
--- a/activemq-core/src/main/java/org/activemq/thread/TaskRunner.java
+++ b/activemq-core/src/main/java/org/activemq/thread/TaskRunner.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.thread;
/**
diff --git a/activemq-core/src/main/java/org/activemq/thread/TaskRunnerFactory.java b/activemq-core/src/main/java/org/activemq/thread/TaskRunnerFactory.java
index 7886e796b4..c2eb5642c0 100755
--- a/activemq-core/src/main/java/org/activemq/thread/TaskRunnerFactory.java
+++ b/activemq-core/src/main/java/org/activemq/thread/TaskRunnerFactory.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.thread;
import edu.emory.mathcs.backport.java.util.concurrent.Executor;
diff --git a/activemq-core/src/main/java/org/activemq/thread/Valve.java b/activemq-core/src/main/java/org/activemq/thread/Valve.java
index d72eb8ae32..5d5c532d2c 100755
--- a/activemq-core/src/main/java/org/activemq/thread/Valve.java
+++ b/activemq-core/src/main/java/org/activemq/thread/Valve.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.thread;
/**
diff --git a/activemq-core/src/main/java/org/activemq/transaction/LocalTransaction.java b/activemq-core/src/main/java/org/activemq/transaction/LocalTransaction.java
index 301baba54c..af5d396045 100755
--- a/activemq-core/src/main/java/org/activemq/transaction/LocalTransaction.java
+++ b/activemq-core/src/main/java/org/activemq/transaction/LocalTransaction.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transaction;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transaction/Synchronization.java b/activemq-core/src/main/java/org/activemq/transaction/Synchronization.java
index 4f508fd5df..e4d670e8c9 100755
--- a/activemq-core/src/main/java/org/activemq/transaction/Synchronization.java
+++ b/activemq-core/src/main/java/org/activemq/transaction/Synchronization.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transaction;
/**
diff --git a/activemq-core/src/main/java/org/activemq/transaction/Transaction.java b/activemq-core/src/main/java/org/activemq/transaction/Transaction.java
index 6ce8d6d8dc..695270167d 100755
--- a/activemq-core/src/main/java/org/activemq/transaction/Transaction.java
+++ b/activemq-core/src/main/java/org/activemq/transaction/Transaction.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transaction;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transaction/XATransaction.java b/activemq-core/src/main/java/org/activemq/transaction/XATransaction.java
index b3cc8d5889..94316bebc5 100755
--- a/activemq-core/src/main/java/org/activemq/transaction/XATransaction.java
+++ b/activemq-core/src/main/java/org/activemq/transaction/XATransaction.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transaction;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/CompositeTransport.java b/activemq-core/src/main/java/org/activemq/transport/CompositeTransport.java
index 03edaeab2c..793816ba65 100644
--- a/activemq-core/src/main/java/org/activemq/transport/CompositeTransport.java
+++ b/activemq-core/src/main/java/org/activemq/transport/CompositeTransport.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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;
import java.net.URI;
diff --git a/activemq-core/src/main/java/org/activemq/transport/FutureResponse.java b/activemq-core/src/main/java/org/activemq/transport/FutureResponse.java
index c267cec474..732c1ae2fe 100755
--- a/activemq-core/src/main/java/org/activemq/transport/FutureResponse.java
+++ b/activemq-core/src/main/java/org/activemq/transport/FutureResponse.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport;
import edu.emory.mathcs.backport.java.util.concurrent.Callable;
diff --git a/activemq-core/src/main/java/org/activemq/transport/InactivityIOException.java b/activemq-core/src/main/java/org/activemq/transport/InactivityIOException.java
index 7a167095ac..cb5ee8df9f 100644
--- a/activemq-core/src/main/java/org/activemq/transport/InactivityIOException.java
+++ b/activemq-core/src/main/java/org/activemq/transport/InactivityIOException.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/InactivityMonitor.java b/activemq-core/src/main/java/org/activemq/transport/InactivityMonitor.java
index 065cbc4772..53023a8706 100755
--- a/activemq-core/src/main/java/org/activemq/transport/InactivityMonitor.java
+++ b/activemq-core/src/main/java/org/activemq/transport/InactivityMonitor.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/MarshallingTransportFilter.java b/activemq-core/src/main/java/org/activemq/transport/MarshallingTransportFilter.java
index 1a3193fac7..6f7c68ad14 100755
--- a/activemq-core/src/main/java/org/activemq/transport/MarshallingTransportFilter.java
+++ b/activemq-core/src/main/java/org/activemq/transport/MarshallingTransportFilter.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activemq.transport;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/MutexTransport.java b/activemq-core/src/main/java/org/activemq/transport/MutexTransport.java
index c60374e855..26df06f615 100755
--- a/activemq-core/src/main/java/org/activemq/transport/MutexTransport.java
+++ b/activemq-core/src/main/java/org/activemq/transport/MutexTransport.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/ResponseCorrelator.java b/activemq-core/src/main/java/org/activemq/transport/ResponseCorrelator.java
index e8470dea18..e98477a892 100755
--- a/activemq-core/src/main/java/org/activemq/transport/ResponseCorrelator.java
+++ b/activemq-core/src/main/java/org/activemq/transport/ResponseCorrelator.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/TransportFactory.java b/activemq-core/src/main/java/org/activemq/transport/TransportFactory.java
index d8c0cccb4b..93a63816c6 100755
--- a/activemq-core/src/main/java/org/activemq/transport/TransportFactory.java
+++ b/activemq-core/src/main/java/org/activemq/transport/TransportFactory.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
diff --git a/activemq-core/src/main/java/org/activemq/transport/TransportFilter.java b/activemq-core/src/main/java/org/activemq/transport/TransportFilter.java
index c94d07a747..d8dcc515d4 100755
--- a/activemq-core/src/main/java/org/activemq/transport/TransportFilter.java
+++ b/activemq-core/src/main/java/org/activemq/transport/TransportFilter.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/TransportListener.java b/activemq-core/src/main/java/org/activemq/transport/TransportListener.java
index fddc0473b5..57b8a2562d 100755
--- a/activemq-core/src/main/java/org/activemq/transport/TransportListener.java
+++ b/activemq-core/src/main/java/org/activemq/transport/TransportListener.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/TransportLogger.java b/activemq-core/src/main/java/org/activemq/transport/TransportLogger.java
index c48133b5c0..c3148257d5 100755
--- a/activemq-core/src/main/java/org/activemq/transport/TransportLogger.java
+++ b/activemq-core/src/main/java/org/activemq/transport/TransportLogger.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/TransportServer.java b/activemq-core/src/main/java/org/activemq/transport/TransportServer.java
index 1c14888c41..8ee1ed55e2 100755
--- a/activemq-core/src/main/java/org/activemq/transport/TransportServer.java
+++ b/activemq-core/src/main/java/org/activemq/transport/TransportServer.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport;
import java.net.URI;
diff --git a/activemq-core/src/main/java/org/activemq/transport/TransportServerFilter.java b/activemq-core/src/main/java/org/activemq/transport/TransportServerFilter.java
index 2a16a8c1d4..456e88d474 100755
--- a/activemq-core/src/main/java/org/activemq/transport/TransportServerFilter.java
+++ b/activemq-core/src/main/java/org/activemq/transport/TransportServerFilter.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport;
import java.net.URI;
diff --git a/activemq-core/src/main/java/org/activemq/transport/TransportServerSupport.java b/activemq-core/src/main/java/org/activemq/transport/TransportServerSupport.java
index 68571f7996..ba2891127c 100644
--- a/activemq-core/src/main/java/org/activemq/transport/TransportServerSupport.java
+++ b/activemq-core/src/main/java/org/activemq/transport/TransportServerSupport.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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;
import java.net.URI;
diff --git a/activemq-core/src/main/java/org/activemq/transport/TransportServerThreadSupport.java b/activemq-core/src/main/java/org/activemq/transport/TransportServerThreadSupport.java
index c28bb06c15..24a2c077d8 100644
--- a/activemq-core/src/main/java/org/activemq/transport/TransportServerThreadSupport.java
+++ b/activemq-core/src/main/java/org/activemq/transport/TransportServerThreadSupport.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
diff --git a/activemq-core/src/main/java/org/activemq/transport/TransportSupport.java b/activemq-core/src/main/java/org/activemq/transport/TransportSupport.java
index 00f2dab0c4..0e1d225bce 100644
--- a/activemq-core/src/main/java/org/activemq/transport/TransportSupport.java
+++ b/activemq-core/src/main/java/org/activemq/transport/TransportSupport.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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;
import org.activemq.command.Command;
diff --git a/activemq-core/src/main/java/org/activemq/transport/TransportThreadSupport.java b/activemq-core/src/main/java/org/activemq/transport/TransportThreadSupport.java
index bbc046e5f8..fcfc0e2e2b 100644
--- a/activemq-core/src/main/java/org/activemq/transport/TransportThreadSupport.java
+++ b/activemq-core/src/main/java/org/activemq/transport/TransportThreadSupport.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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;
import org.activemq.util.ServiceStopper;
diff --git a/activemq-core/src/main/java/org/activemq/transport/WireFormatNegotiator.java b/activemq-core/src/main/java/org/activemq/transport/WireFormatNegotiator.java
index 679c8b5de3..7efac2ec47 100755
--- a/activemq-core/src/main/java/org/activemq/transport/WireFormatNegotiator.java
+++ b/activemq-core/src/main/java/org/activemq/transport/WireFormatNegotiator.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/activeio/ActiveIOTransport.java b/activemq-core/src/main/java/org/activemq/transport/activeio/ActiveIOTransport.java
index 1b09ccbf44..933c26f76b 100755
--- a/activemq-core/src/main/java/org/activemq/transport/activeio/ActiveIOTransport.java
+++ b/activemq-core/src/main/java/org/activemq/transport/activeio/ActiveIOTransport.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.activeio;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/activeio/ActiveIOTransportFactory.java b/activemq-core/src/main/java/org/activemq/transport/activeio/ActiveIOTransportFactory.java
index 6e13808798..6e57fbd790 100755
--- a/activemq-core/src/main/java/org/activemq/transport/activeio/ActiveIOTransportFactory.java
+++ b/activemq-core/src/main/java/org/activemq/transport/activeio/ActiveIOTransportFactory.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport.activeio;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/activeio/ActiveIOTransportServer.java b/activemq-core/src/main/java/org/activemq/transport/activeio/ActiveIOTransportServer.java
index 6c62263717..5ef4bbc788 100755
--- a/activemq-core/src/main/java/org/activemq/transport/activeio/ActiveIOTransportServer.java
+++ b/activemq-core/src/main/java/org/activemq/transport/activeio/ActiveIOTransportServer.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport.activeio;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/activeio/PacketAggregatingAsyncChannel.java b/activemq-core/src/main/java/org/activemq/transport/activeio/PacketAggregatingAsyncChannel.java
index ef08abee9c..a449fc1dbe 100644
--- a/activemq-core/src/main/java/org/activemq/transport/activeio/PacketAggregatingAsyncChannel.java
+++ b/activemq-core/src/main/java/org/activemq/transport/activeio/PacketAggregatingAsyncChannel.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2004 Hiram Chirino
+ * Copyright 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
+ * 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.
*/
package org.activemq.transport.activeio;
diff --git a/activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryAgent.java b/activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryAgent.java
index 5fb0f09740..9acce015fb 100755
--- a/activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryAgent.java
+++ b/activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryAgent.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport.discovery;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryAgentFactory.java b/activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryAgentFactory.java
index e565b224b0..afbc71249d 100755
--- a/activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryAgentFactory.java
+++ b/activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryAgentFactory.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport.discovery;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryTransportFactory.java b/activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryTransportFactory.java
index 656363b853..7e86b82cac 100755
--- a/activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryTransportFactory.java
+++ b/activemq-core/src/main/java/org/activemq/transport/discovery/DiscoveryTransportFactory.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport.discovery;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java b/activemq-core/src/main/java/org/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java
index 62ca0f61db..e461587c90 100755
--- a/activemq-core/src/main/java/org/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java
+++ b/activemq-core/src/main/java/org/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.transport.discovery.multicast;
diff --git a/activemq-core/src/main/java/org/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java b/activemq-core/src/main/java/org/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java
index 791ef01ca9..60a3e4e300 100755
--- a/activemq-core/src/main/java/org/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java
+++ b/activemq-core/src/main/java/org/activemq/transport/discovery/multicast/MulticastDiscoveryAgentFactory.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.discovery.multicast;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/discovery/rendezvous/JmDNSFactory.java b/activemq-core/src/main/java/org/activemq/transport/discovery/rendezvous/JmDNSFactory.java
index 2d5cd67d8e..a412cd57f3 100644
--- a/activemq-core/src/main/java/org/activemq/transport/discovery/rendezvous/JmDNSFactory.java
+++ b/activemq-core/src/main/java/org/activemq/transport/discovery/rendezvous/JmDNSFactory.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activemq.transport.discovery.rendezvous;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java b/activemq-core/src/main/java/org/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java
index 48580c855b..37aac92c81 100755
--- a/activemq-core/src/main/java/org/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java
+++ b/activemq-core/src/main/java/org/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgent.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport.discovery.rendezvous;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgentFactory.java b/activemq-core/src/main/java/org/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgentFactory.java
index bf33733772..d10c8bca9a 100755
--- a/activemq-core/src/main/java/org/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgentFactory.java
+++ b/activemq-core/src/main/java/org/activemq/transport/discovery/rendezvous/RendezvousDiscoveryAgentFactory.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.discovery.rendezvous;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java b/activemq-core/src/main/java/org/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java
index 0af92dfef7..ed3cfd46a7 100755
--- a/activemq-core/src/main/java/org/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java
+++ b/activemq-core/src/main/java/org/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport.discovery.simple;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/failover/FailoverTransport.java b/activemq-core/src/main/java/org/activemq/transport/failover/FailoverTransport.java
index 86dbfc0d95..8a85376d39 100755
--- a/activemq-core/src/main/java/org/activemq/transport/failover/FailoverTransport.java
+++ b/activemq-core/src/main/java/org/activemq/transport/failover/FailoverTransport.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.failover;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/failover/FailoverTransportFactory.java b/activemq-core/src/main/java/org/activemq/transport/failover/FailoverTransportFactory.java
index ef3f08b574..7b255551f5 100755
--- a/activemq-core/src/main/java/org/activemq/transport/failover/FailoverTransportFactory.java
+++ b/activemq-core/src/main/java/org/activemq/transport/failover/FailoverTransportFactory.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport.failover;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/fanout/FanoutTransport.java b/activemq-core/src/main/java/org/activemq/transport/fanout/FanoutTransport.java
index 8c651dc99c..163220691b 100755
--- a/activemq-core/src/main/java/org/activemq/transport/fanout/FanoutTransport.java
+++ b/activemq-core/src/main/java/org/activemq/transport/fanout/FanoutTransport.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.fanout;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/fanout/FanoutTransportFactory.java b/activemq-core/src/main/java/org/activemq/transport/fanout/FanoutTransportFactory.java
index 8be1d6c300..4c605fdee8 100755
--- a/activemq-core/src/main/java/org/activemq/transport/fanout/FanoutTransportFactory.java
+++ b/activemq-core/src/main/java/org/activemq/transport/fanout/FanoutTransportFactory.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport.fanout;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/mock/MockTransport.java b/activemq-core/src/main/java/org/activemq/transport/mock/MockTransport.java
index c1bb3f95c9..14abd77934 100644
--- a/activemq-core/src/main/java/org/activemq/transport/mock/MockTransport.java
+++ b/activemq-core/src/main/java/org/activemq/transport/mock/MockTransport.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport.mock;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/mock/MockTransportFactory.java b/activemq-core/src/main/java/org/activemq/transport/mock/MockTransportFactory.java
index 0395938189..82059a016f 100755
--- a/activemq-core/src/main/java/org/activemq/transport/mock/MockTransportFactory.java
+++ b/activemq-core/src/main/java/org/activemq/transport/mock/MockTransportFactory.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport.mock;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/peer/PeerTransportFactory.java b/activemq-core/src/main/java/org/activemq/transport/peer/PeerTransportFactory.java
index 602175e9e8..58ee40bd22 100755
--- a/activemq-core/src/main/java/org/activemq/transport/peer/PeerTransportFactory.java
+++ b/activemq-core/src/main/java/org/activemq/transport/peer/PeerTransportFactory.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport.peer;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/Abort.java b/activemq-core/src/main/java/org/activemq/transport/stomp/Abort.java
index e52ec312dd..5ad67725e7 100644
--- a/activemq-core/src/main/java/org/activemq/transport/stomp/Abort.java
+++ b/activemq-core/src/main/java/org/activemq/transport/stomp/Abort.java
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
+/**
+ *
+ * Copyright 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.
*/
package org.activemq.transport.stomp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/Ack.java b/activemq-core/src/main/java/org/activemq/transport/stomp/Ack.java
index 101441d061..2cfa8b44dc 100644
--- a/activemq-core/src/main/java/org/activemq/transport/stomp/Ack.java
+++ b/activemq-core/src/main/java/org/activemq/transport/stomp/Ack.java
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
+/**
+ *
+ * Copyright 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.
*/
package org.activemq.transport.stomp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/AsyncHelper.java b/activemq-core/src/main/java/org/activemq/transport/stomp/AsyncHelper.java
index d89de726e4..7c1b1be612 100644
--- a/activemq-core/src/main/java/org/activemq/transport/stomp/AsyncHelper.java
+++ b/activemq-core/src/main/java/org/activemq/transport/stomp/AsyncHelper.java
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
+/**
+ *
+ * Copyright 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.
*/
package org.activemq.transport.stomp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/Begin.java b/activemq-core/src/main/java/org/activemq/transport/stomp/Begin.java
index 568bd1d93c..ec3e2216e7 100644
--- a/activemq-core/src/main/java/org/activemq/transport/stomp/Begin.java
+++ b/activemq-core/src/main/java/org/activemq/transport/stomp/Begin.java
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
+/**
+ *
+ * Copyright 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.
*/
package org.activemq.transport.stomp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/Command.java b/activemq-core/src/main/java/org/activemq/transport/stomp/Command.java
index f8be0f673f..221564d330 100644
--- a/activemq-core/src/main/java/org/activemq/transport/stomp/Command.java
+++ b/activemq-core/src/main/java/org/activemq/transport/stomp/Command.java
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
+/**
+ *
+ * Copyright 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.
*/
package org.activemq.transport.stomp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/CommandEnvelope.java b/activemq-core/src/main/java/org/activemq/transport/stomp/CommandEnvelope.java
index 700d12f4af..7e64d7ab0a 100644
--- a/activemq-core/src/main/java/org/activemq/transport/stomp/CommandEnvelope.java
+++ b/activemq-core/src/main/java/org/activemq/transport/stomp/CommandEnvelope.java
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
+/**
+ *
+ * Copyright 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.
*/
package org.activemq.transport.stomp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/CommandParser.java b/activemq-core/src/main/java/org/activemq/transport/stomp/CommandParser.java
index dbb33b44e3..4298382b41 100644
--- a/activemq-core/src/main/java/org/activemq/transport/stomp/CommandParser.java
+++ b/activemq-core/src/main/java/org/activemq/transport/stomp/CommandParser.java
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
+/**
+ *
+ * Copyright 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.
*/
package org.activemq.transport.stomp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/Commit.java b/activemq-core/src/main/java/org/activemq/transport/stomp/Commit.java
index 9c972949a7..5a3c7a4f98 100644
--- a/activemq-core/src/main/java/org/activemq/transport/stomp/Commit.java
+++ b/activemq-core/src/main/java/org/activemq/transport/stomp/Commit.java
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
+/**
+ *
+ * Copyright 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.
*/
package org.activemq.transport.stomp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/Connect.java b/activemq-core/src/main/java/org/activemq/transport/stomp/Connect.java
index a767a6affa..8ab8a63d91 100644
--- a/activemq-core/src/main/java/org/activemq/transport/stomp/Connect.java
+++ b/activemq-core/src/main/java/org/activemq/transport/stomp/Connect.java
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
+/**
+ *
+ * Copyright 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.
*/
package org.activemq.transport.stomp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/DestinationNamer.java b/activemq-core/src/main/java/org/activemq/transport/stomp/DestinationNamer.java
index c1e9496b83..514dbbde06 100644
--- a/activemq-core/src/main/java/org/activemq/transport/stomp/DestinationNamer.java
+++ b/activemq-core/src/main/java/org/activemq/transport/stomp/DestinationNamer.java
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
+/**
+ *
+ * Copyright 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.
*/
package org.activemq.transport.stomp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/Disconnect.java b/activemq-core/src/main/java/org/activemq/transport/stomp/Disconnect.java
index 26aca7554d..35bf6b1b3a 100644
--- a/activemq-core/src/main/java/org/activemq/transport/stomp/Disconnect.java
+++ b/activemq-core/src/main/java/org/activemq/transport/stomp/Disconnect.java
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
+/**
+ *
+ * Copyright 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.
*/
package org.activemq.transport.stomp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/FrameBuilder.java b/activemq-core/src/main/java/org/activemq/transport/stomp/FrameBuilder.java
index a3bcad8461..53607fd6d6 100644
--- a/activemq-core/src/main/java/org/activemq/transport/stomp/FrameBuilder.java
+++ b/activemq-core/src/main/java/org/activemq/transport/stomp/FrameBuilder.java
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
+/**
+ *
+ * Copyright 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.
*/
package org.activemq.transport.stomp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/HeaderParser.java b/activemq-core/src/main/java/org/activemq/transport/stomp/HeaderParser.java
index e356f573ba..e4e11e2f14 100644
--- a/activemq-core/src/main/java/org/activemq/transport/stomp/HeaderParser.java
+++ b/activemq-core/src/main/java/org/activemq/transport/stomp/HeaderParser.java
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
+/**
+ *
+ * Copyright 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.
*/
package org.activemq.transport.stomp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/ResponseListener.java b/activemq-core/src/main/java/org/activemq/transport/stomp/ResponseListener.java
index 2be7a123c7..962ce4d38b 100644
--- a/activemq-core/src/main/java/org/activemq/transport/stomp/ResponseListener.java
+++ b/activemq-core/src/main/java/org/activemq/transport/stomp/ResponseListener.java
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
+/**
+ *
+ * Copyright 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.
*/
package org.activemq.transport.stomp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/Send.java b/activemq-core/src/main/java/org/activemq/transport/stomp/Send.java
index 8598cb31dd..dc67cef0b7 100644
--- a/activemq-core/src/main/java/org/activemq/transport/stomp/Send.java
+++ b/activemq-core/src/main/java/org/activemq/transport/stomp/Send.java
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
+/**
+ *
+ * Copyright 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.
*/
package org.activemq.transport.stomp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/Stomp.java b/activemq-core/src/main/java/org/activemq/transport/stomp/Stomp.java
index 7a3de0959d..bef06cb651 100644
--- a/activemq-core/src/main/java/org/activemq/transport/stomp/Stomp.java
+++ b/activemq-core/src/main/java/org/activemq/transport/stomp/Stomp.java
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
+/**
+ *
+ * Copyright 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.
*/
package org.activemq.transport.stomp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/StompCommand.java b/activemq-core/src/main/java/org/activemq/transport/stomp/StompCommand.java
index 8a386c4e38..55b26146d1 100644
--- a/activemq-core/src/main/java/org/activemq/transport/stomp/StompCommand.java
+++ b/activemq-core/src/main/java/org/activemq/transport/stomp/StompCommand.java
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
+/**
+ *
+ * Copyright 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.
*/
package org.activemq.transport.stomp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/StompTransportFactory.java b/activemq-core/src/main/java/org/activemq/transport/stomp/StompTransportFactory.java
index 2862d338cb..8d33ca80b9 100644
--- a/activemq-core/src/main/java/org/activemq/transport/stomp/StompTransportFactory.java
+++ b/activemq-core/src/main/java/org/activemq/transport/stomp/StompTransportFactory.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.stomp;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/StompWireFormat.java b/activemq-core/src/main/java/org/activemq/transport/stomp/StompWireFormat.java
index 1a911343e3..c8b7418d26 100644
--- a/activemq-core/src/main/java/org/activemq/transport/stomp/StompWireFormat.java
+++ b/activemq-core/src/main/java/org/activemq/transport/stomp/StompWireFormat.java
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
+/**
+ *
+ * Copyright 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.
*/
package org.activemq.transport.stomp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/StompWireFormatFactory.java b/activemq-core/src/main/java/org/activemq/transport/stomp/StompWireFormatFactory.java
index 4a60457644..7c43297374 100644
--- a/activemq-core/src/main/java/org/activemq/transport/stomp/StompWireFormatFactory.java
+++ b/activemq-core/src/main/java/org/activemq/transport/stomp/StompWireFormatFactory.java
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
+/**
+ *
+ * Copyright 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.
*/
package org.activemq.transport.stomp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/Subscribe.java b/activemq-core/src/main/java/org/activemq/transport/stomp/Subscribe.java
index 4cd1625111..49f353ea1e 100644
--- a/activemq-core/src/main/java/org/activemq/transport/stomp/Subscribe.java
+++ b/activemq-core/src/main/java/org/activemq/transport/stomp/Subscribe.java
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
+/**
+ *
+ * Copyright 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.
*/
package org.activemq.transport.stomp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/Subscription.java b/activemq-core/src/main/java/org/activemq/transport/stomp/Subscription.java
index b9394d5de0..27fcdb72ab 100644
--- a/activemq-core/src/main/java/org/activemq/transport/stomp/Subscription.java
+++ b/activemq-core/src/main/java/org/activemq/transport/stomp/Subscription.java
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
+/**
+ *
+ * Copyright 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.
*/
package org.activemq.transport.stomp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/stomp/Unsubscribe.java b/activemq-core/src/main/java/org/activemq/transport/stomp/Unsubscribe.java
index 4d8060c4ca..c00d9df504 100644
--- a/activemq-core/src/main/java/org/activemq/transport/stomp/Unsubscribe.java
+++ b/activemq-core/src/main/java/org/activemq/transport/stomp/Unsubscribe.java
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
+/**
+ *
+ * Copyright 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.
*/
package org.activemq.transport.stomp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/tcp/ResponseHolder.java b/activemq-core/src/main/java/org/activemq/transport/tcp/ResponseHolder.java
index 894fbec12b..6e2023391b 100755
--- a/activemq-core/src/main/java/org/activemq/transport/tcp/ResponseHolder.java
+++ b/activemq-core/src/main/java/org/activemq/transport/tcp/ResponseHolder.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.transport.tcp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/tcp/TcpBufferedInputStream.java b/activemq-core/src/main/java/org/activemq/transport/tcp/TcpBufferedInputStream.java
index 65eac11069..5db0940f87 100755
--- a/activemq-core/src/main/java/org/activemq/transport/tcp/TcpBufferedInputStream.java
+++ b/activemq-core/src/main/java/org/activemq/transport/tcp/TcpBufferedInputStream.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.transport.tcp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/tcp/TcpBufferedOutputStream.java b/activemq-core/src/main/java/org/activemq/transport/tcp/TcpBufferedOutputStream.java
index 28b3b89e00..225a5ab012 100755
--- a/activemq-core/src/main/java/org/activemq/transport/tcp/TcpBufferedOutputStream.java
+++ b/activemq-core/src/main/java/org/activemq/transport/tcp/TcpBufferedOutputStream.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.transport.tcp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/tcp/TcpTransport.java b/activemq-core/src/main/java/org/activemq/transport/tcp/TcpTransport.java
index a4160d0815..3fa30fe208 100755
--- a/activemq-core/src/main/java/org/activemq/transport/tcp/TcpTransport.java
+++ b/activemq-core/src/main/java/org/activemq/transport/tcp/TcpTransport.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.transport.tcp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/tcp/TcpTransportFactory.java b/activemq-core/src/main/java/org/activemq/transport/tcp/TcpTransportFactory.java
index aab688160d..e79a2cb376 100755
--- a/activemq-core/src/main/java/org/activemq/transport/tcp/TcpTransportFactory.java
+++ b/activemq-core/src/main/java/org/activemq/transport/tcp/TcpTransportFactory.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) Simula Labs Inc.
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.tcp;
import org.activeio.command.WireFormat;
diff --git a/activemq-core/src/main/java/org/activemq/transport/tcp/TcpTransportServer.java b/activemq-core/src/main/java/org/activemq/transport/tcp/TcpTransportServer.java
index 2254ce0acc..d8c0ff26f6 100755
--- a/activemq-core/src/main/java/org/activemq/transport/tcp/TcpTransportServer.java
+++ b/activemq-core/src/main/java/org/activemq/transport/tcp/TcpTransportServer.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.transport.tcp;
diff --git a/activemq-core/src/main/java/org/activemq/transport/vm/VMTransport.java b/activemq-core/src/main/java/org/activemq/transport/vm/VMTransport.java
index 5cce019f1e..5b38b83d22 100755
--- a/activemq-core/src/main/java/org/activemq/transport/vm/VMTransport.java
+++ b/activemq-core/src/main/java/org/activemq/transport/vm/VMTransport.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.transport.vm;
diff --git a/activemq-core/src/main/java/org/activemq/transport/vm/VMTransportFactory.java b/activemq-core/src/main/java/org/activemq/transport/vm/VMTransportFactory.java
index 9be322cae4..abc6406bd4 100755
--- a/activemq-core/src/main/java/org/activemq/transport/vm/VMTransportFactory.java
+++ b/activemq-core/src/main/java/org/activemq/transport/vm/VMTransportFactory.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.vm;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/transport/vm/VMTransportServer.java b/activemq-core/src/main/java/org/activemq/transport/vm/VMTransportServer.java
index 727dbf2361..f5a654f1b8 100755
--- a/activemq-core/src/main/java/org/activemq/transport/vm/VMTransportServer.java
+++ b/activemq-core/src/main/java/org/activemq/transport/vm/VMTransportServer.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport.vm;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/util/Callback.java b/activemq-core/src/main/java/org/activemq/util/Callback.java
index c3a06df163..596304f1f5 100755
--- a/activemq-core/src/main/java/org/activemq/util/Callback.java
+++ b/activemq-core/src/main/java/org/activemq/util/Callback.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.util;
/**
diff --git a/activemq-core/src/main/java/org/activemq/util/ClassLoading.java b/activemq-core/src/main/java/org/activemq/util/ClassLoading.java
index c99b587570..161f433287 100755
--- a/activemq-core/src/main/java/org/activemq/util/ClassLoading.java
+++ b/activemq-core/src/main/java/org/activemq/util/ClassLoading.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.util;
import java.lang.reflect.Array;
diff --git a/activemq-core/src/main/java/org/activemq/util/HexSupport.java b/activemq-core/src/main/java/org/activemq/util/HexSupport.java
index 7279212048..44b3639984 100755
--- a/activemq-core/src/main/java/org/activemq/util/HexSupport.java
+++ b/activemq-core/src/main/java/org/activemq/util/HexSupport.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.util;
/**
diff --git a/activemq-core/src/main/java/org/activemq/util/IOExceptionSupport.java b/activemq-core/src/main/java/org/activemq/util/IOExceptionSupport.java
index e3d60b7717..8a43b4f818 100755
--- a/activemq-core/src/main/java/org/activemq/util/IOExceptionSupport.java
+++ b/activemq-core/src/main/java/org/activemq/util/IOExceptionSupport.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.util;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/util/IndentPrinter.java b/activemq-core/src/main/java/org/activemq/util/IndentPrinter.java
index b9f4853cc0..bf44fb7d46 100755
--- a/activemq-core/src/main/java/org/activemq/util/IndentPrinter.java
+++ b/activemq-core/src/main/java/org/activemq/util/IndentPrinter.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.util;
import java.io.PrintWriter;
diff --git a/activemq-core/src/main/java/org/activemq/util/JMSExceptionSupport.java b/activemq-core/src/main/java/org/activemq/util/JMSExceptionSupport.java
index 559b888604..d85379113a 100755
--- a/activemq-core/src/main/java/org/activemq/util/JMSExceptionSupport.java
+++ b/activemq-core/src/main/java/org/activemq/util/JMSExceptionSupport.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.util;
import javax.jms.JMSException;
diff --git a/activemq-core/src/main/java/org/activemq/util/JMXSupport.java b/activemq-core/src/main/java/org/activemq/util/JMXSupport.java
index b5e12f492c..c672967a8f 100755
--- a/activemq-core/src/main/java/org/activemq/util/JMXSupport.java
+++ b/activemq-core/src/main/java/org/activemq/util/JMXSupport.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activemq.util;
import javax.management.ObjectName;
diff --git a/activemq-core/src/main/java/org/activemq/util/LRUCache.java b/activemq-core/src/main/java/org/activemq/util/LRUCache.java
index cf8a545d41..b320160467 100755
--- a/activemq-core/src/main/java/org/activemq/util/LRUCache.java
+++ b/activemq-core/src/main/java/org/activemq/util/LRUCache.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) RAJD Consultancy 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.util;
diff --git a/activemq-core/src/main/java/org/activemq/util/LongSequenceGenerator.java b/activemq-core/src/main/java/org/activemq/util/LongSequenceGenerator.java
index 2b8fda40f7..e38657107c 100755
--- a/activemq-core/src/main/java/org/activemq/util/LongSequenceGenerator.java
+++ b/activemq-core/src/main/java/org/activemq/util/LongSequenceGenerator.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.util;
public class LongSequenceGenerator {
diff --git a/activemq-core/src/main/java/org/activemq/util/MarshallingSupport.java b/activemq-core/src/main/java/org/activemq/util/MarshallingSupport.java
index c7e9602e0e..c4f62d6c86 100755
--- a/activemq-core/src/main/java/org/activemq/util/MarshallingSupport.java
+++ b/activemq-core/src/main/java/org/activemq/util/MarshallingSupport.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activemq.util;
import java.io.DataInput;
diff --git a/activemq-core/src/main/java/org/activemq/util/ServiceStopper.java b/activemq-core/src/main/java/org/activemq/util/ServiceStopper.java
index 0f60d76888..429837db9c 100644
--- a/activemq-core/src/main/java/org/activemq/util/ServiceStopper.java
+++ b/activemq-core/src/main/java/org/activemq/util/ServiceStopper.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.util;
import org.activemq.Service;
diff --git a/activemq-core/src/main/java/org/activemq/util/TransactionTemplate.java b/activemq-core/src/main/java/org/activemq/util/TransactionTemplate.java
index 8656089f47..0f6eaba2ed 100755
--- a/activemq-core/src/main/java/org/activemq/util/TransactionTemplate.java
+++ b/activemq-core/src/main/java/org/activemq/util/TransactionTemplate.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.util;
import java.io.IOException;
diff --git a/activemq-core/src/main/java/org/activemq/util/TypeConversionSupport.java b/activemq-core/src/main/java/org/activemq/util/TypeConversionSupport.java
index 4debbd58a8..38815a7783 100755
--- a/activemq-core/src/main/java/org/activemq/util/TypeConversionSupport.java
+++ b/activemq-core/src/main/java/org/activemq/util/TypeConversionSupport.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activemq.util;
import java.util.HashMap;
diff --git a/activemq-core/src/main/java/org/activemq/util/URISupport.java b/activemq-core/src/main/java/org/activemq/util/URISupport.java
index 891bac6032..277de8c601 100755
--- a/activemq-core/src/main/java/org/activemq/util/URISupport.java
+++ b/activemq-core/src/main/java/org/activemq/util/URISupport.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.util;
import java.io.UnsupportedEncodingException;
diff --git a/activemq-core/src/main/java/org/activemq/util/WrappedException.java b/activemq-core/src/main/java/org/activemq/util/WrappedException.java
index 1a1afc191e..c19ac4ef8f 100755
--- a/activemq-core/src/main/java/org/activemq/util/WrappedException.java
+++ b/activemq-core/src/main/java/org/activemq/util/WrappedException.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.util;
public class WrappedException extends RuntimeException {
diff --git a/activemq-core/src/main/java/org/activemq/xbean/BrokerFactoryBean.java b/activemq-core/src/main/java/org/activemq/xbean/BrokerFactoryBean.java
index 9a266f4c9e..694bed17f5 100644
--- a/activemq-core/src/main/java/org/activemq/xbean/BrokerFactoryBean.java
+++ b/activemq-core/src/main/java/org/activemq/xbean/BrokerFactoryBean.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.xbean;
import org.activemq.broker.BrokerService;
diff --git a/activemq-core/src/main/java/org/activemq/xbean/XBeanBrokerFactory.java b/activemq-core/src/main/java/org/activemq/xbean/XBeanBrokerFactory.java
index d38f9cb5a3..a4b1469aff 100644
--- a/activemq-core/src/main/java/org/activemq/xbean/XBeanBrokerFactory.java
+++ b/activemq-core/src/main/java/org/activemq/xbean/XBeanBrokerFactory.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.xbean;
import java.beans.PropertyEditorManager;
diff --git a/activemq-core/src/main/java/org/activemq/xbean/XBeanBrokerService.java b/activemq-core/src/main/java/org/activemq/xbean/XBeanBrokerService.java
index a357b742bd..5d71aa9a53 100644
--- a/activemq-core/src/main/java/org/activemq/xbean/XBeanBrokerService.java
+++ b/activemq-core/src/main/java/org/activemq/xbean/XBeanBrokerService.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activemq.xbean;
import org.activemq.broker.BrokerService;
diff --git a/activemq-core/src/test/java/org/activemq/ActiveMQConnectionFactoryTest.java b/activemq-core/src/test/java/org/activemq/ActiveMQConnectionFactoryTest.java
index 169be1d812..e05f16428b 100755
--- a/activemq-core/src/test/java/org/activemq/ActiveMQConnectionFactoryTest.java
+++ b/activemq-core/src/test/java/org/activemq/ActiveMQConnectionFactoryTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import java.net.URI;
diff --git a/activemq-core/src/test/java/org/activemq/ClientTestSupport.java b/activemq-core/src/test/java/org/activemq/ClientTestSupport.java
index 9bd64b9758..cfdbe160d3 100755
--- a/activemq-core/src/test/java/org/activemq/ClientTestSupport.java
+++ b/activemq-core/src/test/java/org/activemq/ClientTestSupport.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
diff --git a/activemq-core/src/test/java/org/activemq/CombinationTestSupport.java b/activemq-core/src/test/java/org/activemq/CombinationTestSupport.java
index 9f96acb4d1..3b82da04bf 100755
--- a/activemq-core/src/test/java/org/activemq/CombinationTestSupport.java
+++ b/activemq-core/src/test/java/org/activemq/CombinationTestSupport.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import java.lang.reflect.Field;
diff --git a/activemq-core/src/test/java/org/activemq/ConnectionCleanupTest.java b/activemq-core/src/test/java/org/activemq/ConnectionCleanupTest.java
index dc1f962ad2..6e3ddb420f 100755
--- a/activemq-core/src/test/java/org/activemq/ConnectionCleanupTest.java
+++ b/activemq-core/src/test/java/org/activemq/ConnectionCleanupTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.JMSException;
diff --git a/activemq-core/src/test/java/org/activemq/ConsumerReceiveWithTimeoutTest.java b/activemq-core/src/test/java/org/activemq/ConsumerReceiveWithTimeoutTest.java
index f8f3b90633..50561f16ab 100644
--- a/activemq-core/src/test/java/org/activemq/ConsumerReceiveWithTimeoutTest.java
+++ b/activemq-core/src/test/java/org/activemq/ConsumerReceiveWithTimeoutTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.Connection;
diff --git a/activemq-core/src/test/java/org/activemq/EmbeddedBrokerTestSupport.java b/activemq-core/src/test/java/org/activemq/EmbeddedBrokerTestSupport.java
index 1ec1e62037..8f43451926 100644
--- a/activemq-core/src/test/java/org/activemq/EmbeddedBrokerTestSupport.java
+++ b/activemq-core/src/test/java/org/activemq/EmbeddedBrokerTestSupport.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import org.activemq.broker.BrokerService;
diff --git a/activemq-core/src/test/java/org/activemq/JMSConsumerTest.java b/activemq-core/src/test/java/org/activemq/JMSConsumerTest.java
index 32e4043d7c..d67d240d2d 100755
--- a/activemq-core/src/test/java/org/activemq/JMSConsumerTest.java
+++ b/activemq-core/src/test/java/org/activemq/JMSConsumerTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.BytesMessage;
diff --git a/activemq-core/src/test/java/org/activemq/JMSDurableTopicRedeliverTest.java b/activemq-core/src/test/java/org/activemq/JMSDurableTopicRedeliverTest.java
index b79966f292..4bf3c42efc 100755
--- a/activemq-core/src/test/java/org/activemq/JMSDurableTopicRedeliverTest.java
+++ b/activemq-core/src/test/java/org/activemq/JMSDurableTopicRedeliverTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.Message;
diff --git a/activemq-core/src/test/java/org/activemq/JMSExclusiveConsumerTest.java b/activemq-core/src/test/java/org/activemq/JMSExclusiveConsumerTest.java
index 4d8ed50d98..da478a57c4 100644
--- a/activemq-core/src/test/java/org/activemq/JMSExclusiveConsumerTest.java
+++ b/activemq-core/src/test/java/org/activemq/JMSExclusiveConsumerTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.DeliveryMode;
diff --git a/activemq-core/src/test/java/org/activemq/JMSMessageTest.java b/activemq-core/src/test/java/org/activemq/JMSMessageTest.java
index a8c5c71a23..cc6bdd5213 100755
--- a/activemq-core/src/test/java/org/activemq/JMSMessageTest.java
+++ b/activemq-core/src/test/java/org/activemq/JMSMessageTest.java
@@ -1,21 +1,19 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 Logic Blaze Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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;
import java.net.URISyntaxException;
diff --git a/activemq-core/src/test/java/org/activemq/JMSQueueRedeliverTest.java b/activemq-core/src/test/java/org/activemq/JMSQueueRedeliverTest.java
index aa271078d9..8c9e27b495 100755
--- a/activemq-core/src/test/java/org/activemq/JMSQueueRedeliverTest.java
+++ b/activemq-core/src/test/java/org/activemq/JMSQueueRedeliverTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
/**
diff --git a/activemq-core/src/test/java/org/activemq/JMSUsecaseTest.java b/activemq-core/src/test/java/org/activemq/JMSUsecaseTest.java
index 8134d705b5..805cc7a547 100755
--- a/activemq-core/src/test/java/org/activemq/JMSUsecaseTest.java
+++ b/activemq-core/src/test/java/org/activemq/JMSUsecaseTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import java.util.Enumeration;
diff --git a/activemq-core/src/test/java/org/activemq/JmsAutoAckListenerTest.java b/activemq-core/src/test/java/org/activemq/JmsAutoAckListenerTest.java
index 794797515b..abea9701dc 100755
--- a/activemq-core/src/test/java/org/activemq/JmsAutoAckListenerTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsAutoAckListenerTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.Connection;
diff --git a/activemq-core/src/test/java/org/activemq/JmsAutoAckTest.java b/activemq-core/src/test/java/org/activemq/JmsAutoAckTest.java
index 739c63b27f..01efbec0b4 100755
--- a/activemq-core/src/test/java/org/activemq/JmsAutoAckTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsAutoAckTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.Connection;
diff --git a/activemq-core/src/test/java/org/activemq/JmsBenchmark.java b/activemq-core/src/test/java/org/activemq/JmsBenchmark.java
index 208921179f..3c700b44d7 100755
--- a/activemq-core/src/test/java/org/activemq/JmsBenchmark.java
+++ b/activemq-core/src/test/java/org/activemq/JmsBenchmark.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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;
import java.io.IOException;
diff --git a/activemq-core/src/test/java/org/activemq/JmsClientAckListenerTest.java b/activemq-core/src/test/java/org/activemq/JmsClientAckListenerTest.java
index 22170ea6db..94a689edba 100755
--- a/activemq-core/src/test/java/org/activemq/JmsClientAckListenerTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsClientAckListenerTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.Connection;
diff --git a/activemq-core/src/test/java/org/activemq/JmsClientAckTest.java b/activemq-core/src/test/java/org/activemq/JmsClientAckTest.java
index 79ccb39174..b0fb78d07b 100755
--- a/activemq-core/src/test/java/org/activemq/JmsClientAckTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsClientAckTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.Connection;
diff --git a/activemq-core/src/test/java/org/activemq/JmsConnectionStartStopTest.java b/activemq-core/src/test/java/org/activemq/JmsConnectionStartStopTest.java
index 6d1dcd4a23..39815feb70 100755
--- a/activemq-core/src/test/java/org/activemq/JmsConnectionStartStopTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsConnectionStartStopTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.Connection;
diff --git a/activemq-core/src/test/java/org/activemq/JmsCreateConsumerInOnMessageTest.java b/activemq-core/src/test/java/org/activemq/JmsCreateConsumerInOnMessageTest.java
index ced8b59a5e..5f69488fc4 100755
--- a/activemq-core/src/test/java/org/activemq/JmsCreateConsumerInOnMessageTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsCreateConsumerInOnMessageTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.Connection;
diff --git a/activemq-core/src/test/java/org/activemq/JmsDurableQueueWildcardSendReceiveTest.java b/activemq-core/src/test/java/org/activemq/JmsDurableQueueWildcardSendReceiveTest.java
index 89f4d0fa1e..1b5bf95a88 100755
--- a/activemq-core/src/test/java/org/activemq/JmsDurableQueueWildcardSendReceiveTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsDurableQueueWildcardSendReceiveTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.DeliveryMode;
diff --git a/activemq-core/src/test/java/org/activemq/JmsDurableTopicSelectorTest.java b/activemq-core/src/test/java/org/activemq/JmsDurableTopicSelectorTest.java
index 8c20a3bc63..819c44aa61 100755
--- a/activemq-core/src/test/java/org/activemq/JmsDurableTopicSelectorTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsDurableTopicSelectorTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
/**
diff --git a/activemq-core/src/test/java/org/activemq/JmsDurableTopicSendReceiveTest.java b/activemq-core/src/test/java/org/activemq/JmsDurableTopicSendReceiveTest.java
index b450f2c60a..36062b06b3 100755
--- a/activemq-core/src/test/java/org/activemq/JmsDurableTopicSendReceiveTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsDurableTopicSendReceiveTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.Connection;
diff --git a/activemq-core/src/test/java/org/activemq/JmsDurableTopicTransactionTest.java b/activemq-core/src/test/java/org/activemq/JmsDurableTopicTransactionTest.java
index db52bfd55e..dda567e938 100755
--- a/activemq-core/src/test/java/org/activemq/JmsDurableTopicTransactionTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsDurableTopicTransactionTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.DeliveryMode;
diff --git a/activemq-core/src/test/java/org/activemq/JmsDurableTopicWildcardSendReceiveTest.java b/activemq-core/src/test/java/org/activemq/JmsDurableTopicWildcardSendReceiveTest.java
index 24abe9d83d..9f6271eace 100755
--- a/activemq-core/src/test/java/org/activemq/JmsDurableTopicWildcardSendReceiveTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsDurableTopicWildcardSendReceiveTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.DeliveryMode;
diff --git a/activemq-core/src/test/java/org/activemq/JmsQueueBrowserTest.java b/activemq-core/src/test/java/org/activemq/JmsQueueBrowserTest.java
index ca9ccde8b5..dda81d2a08 100755
--- a/activemq-core/src/test/java/org/activemq/JmsQueueBrowserTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsQueueBrowserTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import java.util.Enumeration;
diff --git a/activemq-core/src/test/java/org/activemq/JmsQueueCompositeSendReceiveTest.java b/activemq-core/src/test/java/org/activemq/JmsQueueCompositeSendReceiveTest.java
index 8bbdac5e8a..ce46a11e65 100755
--- a/activemq-core/src/test/java/org/activemq/JmsQueueCompositeSendReceiveTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsQueueCompositeSendReceiveTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import org.activemq.test.JmsTopicSendReceiveTest;
diff --git a/activemq-core/src/test/java/org/activemq/JmsQueueRequestReplyTest.java b/activemq-core/src/test/java/org/activemq/JmsQueueRequestReplyTest.java
index e204d6752d..582f86986e 100755
--- a/activemq-core/src/test/java/org/activemq/JmsQueueRequestReplyTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsQueueRequestReplyTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
/**
diff --git a/activemq-core/src/test/java/org/activemq/JmsQueueSelectorTest.java b/activemq-core/src/test/java/org/activemq/JmsQueueSelectorTest.java
index 56cea10b21..956b7371d8 100755
--- a/activemq-core/src/test/java/org/activemq/JmsQueueSelectorTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsQueueSelectorTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
diff --git a/activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveTest.java b/activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveTest.java
index e938abc3ad..7f22a894d9 100755
--- a/activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import org.activemq.test.JmsTopicSendReceiveTest;
diff --git a/activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java b/activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java
index 1ce116a7a5..a133ae39ba 100644
--- a/activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import edu.emory.mathcs.backport.java.util.Queue;
diff --git a/activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveTwoConnectionsTest.java b/activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveTwoConnectionsTest.java
index 1e032b4738..94feea99d4 100755
--- a/activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveTwoConnectionsTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveTwoConnectionsTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import org.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
diff --git a/activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveUsingTwoSessionsTest.java b/activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveUsingTwoSessionsTest.java
index 9ea6dd44ad..aeb7cfd5c8 100755
--- a/activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveUsingTwoSessionsTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsQueueSendReceiveUsingTwoSessionsTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
/**
diff --git a/activemq-core/src/test/java/org/activemq/JmsQueueTopicCompositeSendReceiveTest.java b/activemq-core/src/test/java/org/activemq/JmsQueueTopicCompositeSendReceiveTest.java
index f5cde2286f..4688d9564a 100755
--- a/activemq-core/src/test/java/org/activemq/JmsQueueTopicCompositeSendReceiveTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsQueueTopicCompositeSendReceiveTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import org.activemq.test.JmsTopicSendReceiveTest;
diff --git a/activemq-core/src/test/java/org/activemq/JmsQueueTransactionTest.java b/activemq-core/src/test/java/org/activemq/JmsQueueTransactionTest.java
index 4408dae6d4..7857c09df2 100755
--- a/activemq-core/src/test/java/org/activemq/JmsQueueTransactionTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsQueueTransactionTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import java.util.ArrayList;
diff --git a/activemq-core/src/test/java/org/activemq/JmsQueueWildcardSendReceiveTest.java b/activemq-core/src/test/java/org/activemq/JmsQueueWildcardSendReceiveTest.java
index 58808c9e21..7ce9de99d5 100755
--- a/activemq-core/src/test/java/org/activemq/JmsQueueWildcardSendReceiveTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsQueueWildcardSendReceiveTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.DeliveryMode;
diff --git a/activemq-core/src/test/java/org/activemq/JmsRedeliveredTest.java b/activemq-core/src/test/java/org/activemq/JmsRedeliveredTest.java
index 0a07792ec1..98b84c24da 100755
--- a/activemq-core/src/test/java/org/activemq/JmsRedeliveredTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsRedeliveredTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.Connection;
diff --git a/activemq-core/src/test/java/org/activemq/JmsSendReceiveTestSupport.java b/activemq-core/src/test/java/org/activemq/JmsSendReceiveTestSupport.java
index a7ef22a178..8a18edd6ff 100755
--- a/activemq-core/src/test/java/org/activemq/JmsSendReceiveTestSupport.java
+++ b/activemq-core/src/test/java/org/activemq/JmsSendReceiveTestSupport.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.DeliveryMode;
diff --git a/activemq-core/src/test/java/org/activemq/JmsSessionRecoverTest.java b/activemq-core/src/test/java/org/activemq/JmsSessionRecoverTest.java
index e94b64b504..5eaaa8cf25 100755
--- a/activemq-core/src/test/java/org/activemq/JmsSessionRecoverTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsSessionRecoverTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.Connection;
diff --git a/activemq-core/src/test/java/org/activemq/JmsTempDestinationTest.java b/activemq-core/src/test/java/org/activemq/JmsTempDestinationTest.java
index 56dfba3e1b..ad8f643ea7 100755
--- a/activemq-core/src/test/java/org/activemq/JmsTempDestinationTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsTempDestinationTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import java.util.ArrayList;
diff --git a/activemq-core/src/test/java/org/activemq/JmsTestSupport.java b/activemq-core/src/test/java/org/activemq/JmsTestSupport.java
index d0e6117b0e..ab8766b436 100755
--- a/activemq-core/src/test/java/org/activemq/JmsTestSupport.java
+++ b/activemq-core/src/test/java/org/activemq/JmsTestSupport.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import java.io.IOException;
diff --git a/activemq-core/src/test/java/org/activemq/JmsTopicCompositeSendReceiveTest.java b/activemq-core/src/test/java/org/activemq/JmsTopicCompositeSendReceiveTest.java
index a1ca9b9732..30b42cd2bd 100755
--- a/activemq-core/src/test/java/org/activemq/JmsTopicCompositeSendReceiveTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsTopicCompositeSendReceiveTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import org.activemq.test.JmsTopicSendReceiveTest;
diff --git a/activemq-core/src/test/java/org/activemq/JmsTopicRedeliverTest.java b/activemq-core/src/test/java/org/activemq/JmsTopicRedeliverTest.java
index c55a23b43f..0e143f4026 100755
--- a/activemq-core/src/test/java/org/activemq/JmsTopicRedeliverTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsTopicRedeliverTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.Connection;
diff --git a/activemq-core/src/test/java/org/activemq/JmsTopicRequestReplyTest.java b/activemq-core/src/test/java/org/activemq/JmsTopicRequestReplyTest.java
index 5be4e22e19..e8b0676471 100755
--- a/activemq-core/src/test/java/org/activemq/JmsTopicRequestReplyTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsTopicRequestReplyTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import java.util.List;
diff --git a/activemq-core/src/test/java/org/activemq/JmsTopicSelectorTest.java b/activemq-core/src/test/java/org/activemq/JmsTopicSelectorTest.java
index 683983abf0..5fe1c28a2d 100755
--- a/activemq-core/src/test/java/org/activemq/JmsTopicSelectorTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsTopicSelectorTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
diff --git a/activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveSubscriberTest.java b/activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveSubscriberTest.java
index 7e4cccc48f..ca706e97e8 100755
--- a/activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveSubscriberTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveSubscriberTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.JMSException;
diff --git a/activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveTest.java b/activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveTest.java
index 40a3c9aeb2..df0007517f 100755
--- a/activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.Connection;
diff --git a/activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveWithTwoConnectionsTest.java b/activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveWithTwoConnectionsTest.java
index 0b851d214d..5e924f845f 100755
--- a/activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveWithTwoConnectionsTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveWithTwoConnectionsTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.Connection;
diff --git a/activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveWithTwoConnectionsWithJMXTest.java b/activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveWithTwoConnectionsWithJMXTest.java
index 2bda666879..d34231333a 100644
--- a/activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveWithTwoConnectionsWithJMXTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsTopicSendReceiveWithTwoConnectionsWithJMXTest.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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;
/**
diff --git a/activemq-core/src/test/java/org/activemq/JmsTopicSendSameMessageTest.java b/activemq-core/src/test/java/org/activemq/JmsTopicSendSameMessageTest.java
index d86a99534e..1538e43c3f 100755
--- a/activemq-core/src/test/java/org/activemq/JmsTopicSendSameMessageTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsTopicSendSameMessageTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.TextMessage;
diff --git a/activemq-core/src/test/java/org/activemq/JmsTopicTransactionTest.java b/activemq-core/src/test/java/org/activemq/JmsTopicTransactionTest.java
index 7ed4f7d2cc..a0b10f8008 100755
--- a/activemq-core/src/test/java/org/activemq/JmsTopicTransactionTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsTopicTransactionTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import org.activemq.test.JmsResourceProvider;
diff --git a/activemq-core/src/test/java/org/activemq/JmsTopicWildcardSendReceiveTest.java b/activemq-core/src/test/java/org/activemq/JmsTopicWildcardSendReceiveTest.java
index b468cd541f..1494afda51 100755
--- a/activemq-core/src/test/java/org/activemq/JmsTopicWildcardSendReceiveTest.java
+++ b/activemq-core/src/test/java/org/activemq/JmsTopicWildcardSendReceiveTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.DeliveryMode;
diff --git a/activemq-core/src/test/java/org/activemq/JmsTransactionTestSupport.java b/activemq-core/src/test/java/org/activemq/JmsTransactionTestSupport.java
index 4e571956c2..40c7584551 100755
--- a/activemq-core/src/test/java/org/activemq/JmsTransactionTestSupport.java
+++ b/activemq-core/src/test/java/org/activemq/JmsTransactionTestSupport.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import org.activemq.test.JmsResourceProvider;
diff --git a/activemq-core/src/test/java/org/activemq/LargeMessageTestSupport.java b/activemq-core/src/test/java/org/activemq/LargeMessageTestSupport.java
index 272cee2a3f..3367cadec1 100755
--- a/activemq-core/src/test/java/org/activemq/LargeMessageTestSupport.java
+++ b/activemq-core/src/test/java/org/activemq/LargeMessageTestSupport.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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;
diff --git a/activemq-core/src/test/java/org/activemq/LoadTestBurnIn.java b/activemq-core/src/test/java/org/activemq/LoadTestBurnIn.java
index da4afebd6e..72c4a29995 100644
--- a/activemq-core/src/test/java/org/activemq/LoadTestBurnIn.java
+++ b/activemq-core/src/test/java/org/activemq/LoadTestBurnIn.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import java.io.IOException;
diff --git a/activemq-core/src/test/java/org/activemq/MessageTransformationTest.java b/activemq-core/src/test/java/org/activemq/MessageTransformationTest.java
index 0c69daa4c4..2cb1ea7e56 100755
--- a/activemq-core/src/test/java/org/activemq/MessageTransformationTest.java
+++ b/activemq-core/src/test/java/org/activemq/MessageTransformationTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
diff --git a/activemq-core/src/test/java/org/activemq/RedeliveryPolicyTest.java b/activemq-core/src/test/java/org/activemq/RedeliveryPolicyTest.java
index c22bb16da8..0449422f1c 100644
--- a/activemq-core/src/test/java/org/activemq/RedeliveryPolicyTest.java
+++ b/activemq-core/src/test/java/org/activemq/RedeliveryPolicyTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import javax.jms.MessageConsumer;
diff --git a/activemq-core/src/test/java/org/activemq/SpringTestSupport.java b/activemq-core/src/test/java/org/activemq/SpringTestSupport.java
index 9eacf35a33..e2005b703d 100755
--- a/activemq-core/src/test/java/org/activemq/SpringTestSupport.java
+++ b/activemq-core/src/test/java/org/activemq/SpringTestSupport.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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;
diff --git a/activemq-core/src/test/java/org/activemq/TestSupport.java b/activemq-core/src/test/java/org/activemq/TestSupport.java
index d9a58b8c97..bd82351d0d 100755
--- a/activemq-core/src/test/java/org/activemq/TestSupport.java
+++ b/activemq-core/src/test/java/org/activemq/TestSupport.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq;
import java.io.File;
diff --git a/activemq-core/src/test/java/org/activemq/advisory/ConsumerListenerTest.java b/activemq-core/src/test/java/org/activemq/advisory/ConsumerListenerTest.java
index 38b121417e..2858747e5e 100644
--- a/activemq-core/src/test/java/org/activemq/advisory/ConsumerListenerTest.java
+++ b/activemq-core/src/test/java/org/activemq/advisory/ConsumerListenerTest.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.advisory;
import edu.emory.mathcs.backport.java.util.concurrent.ArrayBlockingQueue;
diff --git a/activemq-core/src/test/java/org/activemq/broker/BrokerBenchmark.java b/activemq-core/src/test/java/org/activemq/broker/BrokerBenchmark.java
index 02d22752f6..fa5de2ed41 100755
--- a/activemq-core/src/test/java/org/activemq/broker/BrokerBenchmark.java
+++ b/activemq-core/src/test/java/org/activemq/broker/BrokerBenchmark.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker;
diff --git a/activemq-core/src/test/java/org/activemq/broker/BrokerRestartTestSupport.java b/activemq-core/src/test/java/org/activemq/broker/BrokerRestartTestSupport.java
index 9aa8776757..5af319b779 100644
--- a/activemq-core/src/test/java/org/activemq/broker/BrokerRestartTestSupport.java
+++ b/activemq-core/src/test/java/org/activemq/broker/BrokerRestartTestSupport.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activemq.broker;
import java.io.IOException;
diff --git a/activemq-core/src/test/java/org/activemq/broker/BrokerTest.java b/activemq-core/src/test/java/org/activemq/broker/BrokerTest.java
index 6ab3545836..5f09c48b7e 100755
--- a/activemq-core/src/test/java/org/activemq/broker/BrokerTest.java
+++ b/activemq-core/src/test/java/org/activemq/broker/BrokerTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker;
import javax.jms.DeliveryMode;
diff --git a/activemq-core/src/test/java/org/activemq/broker/BrokerTestSupport.java b/activemq-core/src/test/java/org/activemq/broker/BrokerTestSupport.java
index 95eb7f90cf..7b71108b1f 100755
--- a/activemq-core/src/test/java/org/activemq/broker/BrokerTestSupport.java
+++ b/activemq-core/src/test/java/org/activemq/broker/BrokerTestSupport.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker;
import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
diff --git a/activemq-core/src/test/java/org/activemq/broker/MarshallingBrokerTest.java b/activemq-core/src/test/java/org/activemq/broker/MarshallingBrokerTest.java
index f0590110ca..7330cf1d94 100755
--- a/activemq-core/src/test/java/org/activemq/broker/MarshallingBrokerTest.java
+++ b/activemq-core/src/test/java/org/activemq/broker/MarshallingBrokerTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker;
import java.io.IOException;
diff --git a/activemq-core/src/test/java/org/activemq/broker/ProgressPrinter.java b/activemq-core/src/test/java/org/activemq/broker/ProgressPrinter.java
index 73278104b4..b07faddac5 100755
--- a/activemq-core/src/test/java/org/activemq/broker/ProgressPrinter.java
+++ b/activemq-core/src/test/java/org/activemq/broker/ProgressPrinter.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker;
diff --git a/activemq-core/src/test/java/org/activemq/broker/RecoveryBrokerTest.java b/activemq-core/src/test/java/org/activemq/broker/RecoveryBrokerTest.java
index f3fc887d8b..9f2ad54370 100755
--- a/activemq-core/src/test/java/org/activemq/broker/RecoveryBrokerTest.java
+++ b/activemq-core/src/test/java/org/activemq/broker/RecoveryBrokerTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker;
import javax.jms.DeliveryMode;
diff --git a/activemq-core/src/test/java/org/activemq/broker/SpringTest.java b/activemq-core/src/test/java/org/activemq/broker/SpringTest.java
index a6a36feb21..0973b3eebf 100755
--- a/activemq-core/src/test/java/org/activemq/broker/SpringTest.java
+++ b/activemq-core/src/test/java/org/activemq/broker/SpringTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker;
diff --git a/activemq-core/src/test/java/org/activemq/broker/StubConnection.java b/activemq-core/src/test/java/org/activemq/broker/StubConnection.java
index 58e437fdc2..e225629694 100755
--- a/activemq-core/src/test/java/org/activemq/broker/StubConnection.java
+++ b/activemq-core/src/test/java/org/activemq/broker/StubConnection.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.broker;
import java.io.IOException;
diff --git a/activemq-core/src/test/java/org/activemq/broker/XARecoveryBrokerTest.java b/activemq-core/src/test/java/org/activemq/broker/XARecoveryBrokerTest.java
index 66cd506150..49445179ae 100755
--- a/activemq-core/src/test/java/org/activemq/broker/XARecoveryBrokerTest.java
+++ b/activemq-core/src/test/java/org/activemq/broker/XARecoveryBrokerTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker;
import junit.framework.Test;
diff --git a/activemq-core/src/test/java/org/activemq/broker/store/DefaultStoreBrokerTest.java b/activemq-core/src/test/java/org/activemq/broker/store/DefaultStoreBrokerTest.java
index 2777dc218b..3d1313bc9d 100755
--- a/activemq-core/src/test/java/org/activemq/broker/store/DefaultStoreBrokerTest.java
+++ b/activemq-core/src/test/java/org/activemq/broker/store/DefaultStoreBrokerTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.store;
import java.io.File;
diff --git a/activemq-core/src/test/java/org/activemq/broker/store/DefaultStoreRecoveryBrokerTest.java b/activemq-core/src/test/java/org/activemq/broker/store/DefaultStoreRecoveryBrokerTest.java
index 1447493b9b..05740c84fd 100755
--- a/activemq-core/src/test/java/org/activemq/broker/store/DefaultStoreRecoveryBrokerTest.java
+++ b/activemq-core/src/test/java/org/activemq/broker/store/DefaultStoreRecoveryBrokerTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.store;
import java.net.URI;
diff --git a/activemq-core/src/test/java/org/activemq/broker/store/DefaultStoreXARecoveryBrokerTest.java b/activemq-core/src/test/java/org/activemq/broker/store/DefaultStoreXARecoveryBrokerTest.java
index 2787735544..6d50c8b438 100755
--- a/activemq-core/src/test/java/org/activemq/broker/store/DefaultStoreXARecoveryBrokerTest.java
+++ b/activemq-core/src/test/java/org/activemq/broker/store/DefaultStoreXARecoveryBrokerTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.store;
import java.net.URI;
diff --git a/activemq-core/src/test/java/org/activemq/broker/store/LoadTester.java b/activemq-core/src/test/java/org/activemq/broker/store/LoadTester.java
index 085ce66579..b2adeff8a9 100755
--- a/activemq-core/src/test/java/org/activemq/broker/store/LoadTester.java
+++ b/activemq-core/src/test/java/org/activemq/broker/store/LoadTester.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.store;
import java.io.IOException;
diff --git a/activemq-core/src/test/java/org/activemq/broker/store/QuickJournalRecoveryBrokerTest.java b/activemq-core/src/test/java/org/activemq/broker/store/QuickJournalRecoveryBrokerTest.java
index ba84e8e6fb..010ef7ce74 100644
--- a/activemq-core/src/test/java/org/activemq/broker/store/QuickJournalRecoveryBrokerTest.java
+++ b/activemq-core/src/test/java/org/activemq/broker/store/QuickJournalRecoveryBrokerTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.store;
import junit.framework.Test;
diff --git a/activemq-core/src/test/java/org/activemq/broker/store/QuickJournalXARecoveryBrokerTest.java b/activemq-core/src/test/java/org/activemq/broker/store/QuickJournalXARecoveryBrokerTest.java
index 0c6e4acd4c..5754081408 100644
--- a/activemq-core/src/test/java/org/activemq/broker/store/QuickJournalXARecoveryBrokerTest.java
+++ b/activemq-core/src/test/java/org/activemq/broker/store/QuickJournalXARecoveryBrokerTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.broker.store;
import junit.framework.Test;
diff --git a/activemq-core/src/test/java/org/activemq/command/ActiveMQBytesMessageTest.java b/activemq-core/src/test/java/org/activemq/command/ActiveMQBytesMessageTest.java
index 92cb1b82e7..489e017cfa 100755
--- a/activemq-core/src/test/java/org/activemq/command/ActiveMQBytesMessageTest.java
+++ b/activemq-core/src/test/java/org/activemq/command/ActiveMQBytesMessageTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import javax.jms.JMSException;
diff --git a/activemq-core/src/test/java/org/activemq/command/ActiveMQDestinationTest.java b/activemq-core/src/test/java/org/activemq/command/ActiveMQDestinationTest.java
index 0780a888e4..0e6e212e01 100755
--- a/activemq-core/src/test/java/org/activemq/command/ActiveMQDestinationTest.java
+++ b/activemq-core/src/test/java/org/activemq/command/ActiveMQDestinationTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import java.io.IOException;
diff --git a/activemq-core/src/test/java/org/activemq/command/ActiveMQMapMessageTest.java b/activemq-core/src/test/java/org/activemq/command/ActiveMQMapMessageTest.java
index 7740defc6f..d96ad15da2 100755
--- a/activemq-core/src/test/java/org/activemq/command/ActiveMQMapMessageTest.java
+++ b/activemq-core/src/test/java/org/activemq/command/ActiveMQMapMessageTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import java.io.IOException;
diff --git a/activemq-core/src/test/java/org/activemq/command/ActiveMQMessageTest.java b/activemq-core/src/test/java/org/activemq/command/ActiveMQMessageTest.java
index e47e4f8913..69a6b8bb5d 100755
--- a/activemq-core/src/test/java/org/activemq/command/ActiveMQMessageTest.java
+++ b/activemq-core/src/test/java/org/activemq/command/ActiveMQMessageTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import java.io.IOException;
diff --git a/activemq-core/src/test/java/org/activemq/command/ActiveMQObjectMessageTest.java b/activemq-core/src/test/java/org/activemq/command/ActiveMQObjectMessageTest.java
index cce9e63b80..195a26f9f2 100755
--- a/activemq-core/src/test/java/org/activemq/command/ActiveMQObjectMessageTest.java
+++ b/activemq-core/src/test/java/org/activemq/command/ActiveMQObjectMessageTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import junit.framework.TestCase;
diff --git a/activemq-core/src/test/java/org/activemq/command/ActiveMQStreamMessageTest.java b/activemq-core/src/test/java/org/activemq/command/ActiveMQStreamMessageTest.java
index 5b8d21c44d..2fee34386d 100755
--- a/activemq-core/src/test/java/org/activemq/command/ActiveMQStreamMessageTest.java
+++ b/activemq-core/src/test/java/org/activemq/command/ActiveMQStreamMessageTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import java.io.Serializable;
diff --git a/activemq-core/src/test/java/org/activemq/command/ActiveMQTextMessageTest.java b/activemq-core/src/test/java/org/activemq/command/ActiveMQTextMessageTest.java
index ce01b3200b..0e1af713ae 100755
--- a/activemq-core/src/test/java/org/activemq/command/ActiveMQTextMessageTest.java
+++ b/activemq-core/src/test/java/org/activemq/command/ActiveMQTextMessageTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.command;
import java.io.IOException;
diff --git a/activemq-core/src/test/java/org/activemq/command/DataStructureTestSupport.java b/activemq-core/src/test/java/org/activemq/command/DataStructureTestSupport.java
index 20a018e070..9e2217e619 100755
--- a/activemq-core/src/test/java/org/activemq/command/DataStructureTestSupport.java
+++ b/activemq-core/src/test/java/org/activemq/command/DataStructureTestSupport.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.command;
import org.activeio.Packet;
diff --git a/activemq-core/src/test/java/org/activemq/command/MessageSendTest.java b/activemq-core/src/test/java/org/activemq/command/MessageSendTest.java
index 5ddd4cb6a8..ee9e3aa2fe 100755
--- a/activemq-core/src/test/java/org/activemq/command/MessageSendTest.java
+++ b/activemq-core/src/test/java/org/activemq/command/MessageSendTest.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.command;
import org.activeio.ByteSequence;
diff --git a/activemq-core/src/test/java/org/activemq/command/MessageTest.java b/activemq-core/src/test/java/org/activemq/command/MessageTest.java
index 0862effa27..843d4de0a7 100755
--- a/activemq-core/src/test/java/org/activemq/command/MessageTest.java
+++ b/activemq-core/src/test/java/org/activemq/command/MessageTest.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.command;
import org.activeio.command.WireFormat;
diff --git a/activemq-core/src/test/java/org/activemq/demo/SimpleConsumer.java b/activemq-core/src/test/java/org/activemq/demo/SimpleConsumer.java
index daf223a52f..62cf9473c1 100755
--- a/activemq-core/src/test/java/org/activemq/demo/SimpleConsumer.java
+++ b/activemq-core/src/test/java/org/activemq/demo/SimpleConsumer.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
/**
* The SimpleQueueReceiver class consists only of a main method,
diff --git a/activemq-core/src/test/java/org/activemq/demo/SimpleProducer.java b/activemq-core/src/test/java/org/activemq/demo/SimpleProducer.java
index 7562b1a1af..864a4f6ae0 100755
--- a/activemq-core/src/test/java/org/activemq/demo/SimpleProducer.java
+++ b/activemq-core/src/test/java/org/activemq/demo/SimpleProducer.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
/**
* The SimpleQueueSender class consists only of a main method,
diff --git a/activemq-core/src/test/java/org/activemq/demo/SimpleQueueReceiver.java b/activemq-core/src/test/java/org/activemq/demo/SimpleQueueReceiver.java
index 4c08ce5745..e1bfed7025 100755
--- a/activemq-core/src/test/java/org/activemq/demo/SimpleQueueReceiver.java
+++ b/activemq-core/src/test/java/org/activemq/demo/SimpleQueueReceiver.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
/**
* The SimpleQueueReceiver class consists only of a main method,
diff --git a/activemq-core/src/test/java/org/activemq/demo/SimpleQueueSender.java b/activemq-core/src/test/java/org/activemq/demo/SimpleQueueSender.java
index 50b545c755..1aa1491340 100755
--- a/activemq-core/src/test/java/org/activemq/demo/SimpleQueueSender.java
+++ b/activemq-core/src/test/java/org/activemq/demo/SimpleQueueSender.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
/**
* The SimpleQueueSender class consists only of a main method,
diff --git a/activemq-core/src/test/java/org/activemq/filter/BadDummyPolicyConfigTest.java b/activemq-core/src/test/java/org/activemq/filter/BadDummyPolicyConfigTest.java
index 4db6258769..84cfa4876a 100644
--- a/activemq-core/src/test/java/org/activemq/filter/BadDummyPolicyConfigTest.java
+++ b/activemq-core/src/test/java/org/activemq/filter/BadDummyPolicyConfigTest.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.filter;
import junit.framework.TestCase;
diff --git a/activemq-core/src/test/java/org/activemq/filter/DestinationMapTest.java b/activemq-core/src/test/java/org/activemq/filter/DestinationMapTest.java
index cd43a8222b..a492d1d6f2 100755
--- a/activemq-core/src/test/java/org/activemq/filter/DestinationMapTest.java
+++ b/activemq-core/src/test/java/org/activemq/filter/DestinationMapTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
diff --git a/activemq-core/src/test/java/org/activemq/filter/DestinationPathTest.java b/activemq-core/src/test/java/org/activemq/filter/DestinationPathTest.java
index 09f0cbac07..56246638f5 100755
--- a/activemq-core/src/test/java/org/activemq/filter/DestinationPathTest.java
+++ b/activemq-core/src/test/java/org/activemq/filter/DestinationPathTest.java
@@ -1,22 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
-
+ *
+ * Copyright 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.
+ */
package org.activemq.filter;
import junit.framework.TestCase;
diff --git a/activemq-core/src/test/java/org/activemq/filter/DummyPolicy.java b/activemq-core/src/test/java/org/activemq/filter/DummyPolicy.java
index 94a4bc779d..71db4d43a9 100644
--- a/activemq-core/src/test/java/org/activemq/filter/DummyPolicy.java
+++ b/activemq-core/src/test/java/org/activemq/filter/DummyPolicy.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.filter;
import java.util.List;
diff --git a/activemq-core/src/test/java/org/activemq/filter/DummyPolicyEntry.java b/activemq-core/src/test/java/org/activemq/filter/DummyPolicyEntry.java
index 5339a3bed1..ccd826066d 100644
--- a/activemq-core/src/test/java/org/activemq/filter/DummyPolicyEntry.java
+++ b/activemq-core/src/test/java/org/activemq/filter/DummyPolicyEntry.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.filter;
/**
diff --git a/activemq-core/src/test/java/org/activemq/filter/DummyPolicyTest.java b/activemq-core/src/test/java/org/activemq/filter/DummyPolicyTest.java
index 912669265e..058ca0a5bf 100644
--- a/activemq-core/src/test/java/org/activemq/filter/DummyPolicyTest.java
+++ b/activemq-core/src/test/java/org/activemq/filter/DummyPolicyTest.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.filter;
import org.activemq.SpringTestSupport;
diff --git a/activemq-core/src/test/java/org/activemq/jndi/ActiveMQInitialContextFactoryTest.java b/activemq-core/src/test/java/org/activemq/jndi/ActiveMQInitialContextFactoryTest.java
index f2734caef4..1750922dc2 100755
--- a/activemq-core/src/test/java/org/activemq/jndi/ActiveMQInitialContextFactoryTest.java
+++ b/activemq-core/src/test/java/org/activemq/jndi/ActiveMQInitialContextFactoryTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.jndi;
import org.activemq.command.ActiveMQQueue;
diff --git a/activemq-core/src/test/java/org/activemq/jndi/CustomConnectionFactoryNameTest.java b/activemq-core/src/test/java/org/activemq/jndi/CustomConnectionFactoryNameTest.java
index 0d7cf169cf..168c07c010 100755
--- a/activemq-core/src/test/java/org/activemq/jndi/CustomConnectionFactoryNameTest.java
+++ b/activemq-core/src/test/java/org/activemq/jndi/CustomConnectionFactoryNameTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.jndi;
import javax.naming.NamingException;
diff --git a/activemq-core/src/test/java/org/activemq/jndi/DestinationNameWithSlashTest.java b/activemq-core/src/test/java/org/activemq/jndi/DestinationNameWithSlashTest.java
index 3d35bb094c..cf0e624f8e 100755
--- a/activemq-core/src/test/java/org/activemq/jndi/DestinationNameWithSlashTest.java
+++ b/activemq-core/src/test/java/org/activemq/jndi/DestinationNameWithSlashTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.jndi;
diff --git a/activemq-core/src/test/java/org/activemq/jndi/InitialContextTest.java b/activemq-core/src/test/java/org/activemq/jndi/InitialContextTest.java
index edd65e4b5b..7884d6db6a 100755
--- a/activemq-core/src/test/java/org/activemq/jndi/InitialContextTest.java
+++ b/activemq-core/src/test/java/org/activemq/jndi/InitialContextTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.jndi;
import junit.framework.TestCase;
diff --git a/activemq-core/src/test/java/org/activemq/jndi/JNDITestSupport.java b/activemq-core/src/test/java/org/activemq/jndi/JNDITestSupport.java
index e1e29fa9fe..9fa25170a8 100755
--- a/activemq-core/src/test/java/org/activemq/jndi/JNDITestSupport.java
+++ b/activemq-core/src/test/java/org/activemq/jndi/JNDITestSupport.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.jndi;
import junit.framework.TestCase;
diff --git a/activemq-core/src/test/java/org/activemq/management/BoundaryStatisticTest.java b/activemq-core/src/test/java/org/activemq/management/BoundaryStatisticTest.java
index 0833dc15f4..2c1be4161b 100755
--- a/activemq-core/src/test/java/org/activemq/management/BoundaryStatisticTest.java
+++ b/activemq-core/src/test/java/org/activemq/management/BoundaryStatisticTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
public class BoundaryStatisticTest extends StatisticTestSupport {
diff --git a/activemq-core/src/test/java/org/activemq/management/BoundedRangeStatisticTest.java b/activemq-core/src/test/java/org/activemq/management/BoundedRangeStatisticTest.java
index eab0acef6e..4f20013b19 100755
--- a/activemq-core/src/test/java/org/activemq/management/BoundedRangeStatisticTest.java
+++ b/activemq-core/src/test/java/org/activemq/management/BoundedRangeStatisticTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
diff --git a/activemq-core/src/test/java/org/activemq/management/CountStatisticTest.java b/activemq-core/src/test/java/org/activemq/management/CountStatisticTest.java
index 7d5510eb6a..2b16733cfa 100755
--- a/activemq-core/src/test/java/org/activemq/management/CountStatisticTest.java
+++ b/activemq-core/src/test/java/org/activemq/management/CountStatisticTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
public class CountStatisticTest extends StatisticTestSupport {
diff --git a/activemq-core/src/test/java/org/activemq/management/RangeStatisticTest.java b/activemq-core/src/test/java/org/activemq/management/RangeStatisticTest.java
index e2c244c66d..648a6dc4d7 100755
--- a/activemq-core/src/test/java/org/activemq/management/RangeStatisticTest.java
+++ b/activemq-core/src/test/java/org/activemq/management/RangeStatisticTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
public class RangeStatisticTest extends StatisticTestSupport {
diff --git a/activemq-core/src/test/java/org/activemq/management/StatisticTestSupport.java b/activemq-core/src/test/java/org/activemq/management/StatisticTestSupport.java
index 2bce0d4956..b1af01205a 100755
--- a/activemq-core/src/test/java/org/activemq/management/StatisticTestSupport.java
+++ b/activemq-core/src/test/java/org/activemq/management/StatisticTestSupport.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
import junit.framework.TestCase;
diff --git a/activemq-core/src/test/java/org/activemq/management/TimeStatisticTest.java b/activemq-core/src/test/java/org/activemq/management/TimeStatisticTest.java
index 8f8ae96c14..33e0342393 100755
--- a/activemq-core/src/test/java/org/activemq/management/TimeStatisticTest.java
+++ b/activemq-core/src/test/java/org/activemq/management/TimeStatisticTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.management;
public class TimeStatisticTest extends StatisticTestSupport {
diff --git a/activemq-core/src/test/java/org/activemq/memory/buffer/DummyMessage.java b/activemq-core/src/test/java/org/activemq/memory/buffer/DummyMessage.java
index af79a6f6ec..608c8281e4 100644
--- a/activemq-core/src/test/java/org/activemq/memory/buffer/DummyMessage.java
+++ b/activemq-core/src/test/java/org/activemq/memory/buffer/DummyMessage.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.memory.buffer;
import org.activemq.command.ActiveMQMessage;
diff --git a/activemq-core/src/test/java/org/activemq/memory/buffer/MemoryBufferTestSupport.java b/activemq-core/src/test/java/org/activemq/memory/buffer/MemoryBufferTestSupport.java
index 155f26206d..14f2422295 100644
--- a/activemq-core/src/test/java/org/activemq/memory/buffer/MemoryBufferTestSupport.java
+++ b/activemq-core/src/test/java/org/activemq/memory/buffer/MemoryBufferTestSupport.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.memory.buffer;
import org.activemq.command.ActiveMQMessage;
diff --git a/activemq-core/src/test/java/org/activemq/memory/buffer/OrderBasedMemoryBufferTest.java b/activemq-core/src/test/java/org/activemq/memory/buffer/OrderBasedMemoryBufferTest.java
index 445295fbe6..c96a0f6cc4 100644
--- a/activemq-core/src/test/java/org/activemq/memory/buffer/OrderBasedMemoryBufferTest.java
+++ b/activemq-core/src/test/java/org/activemq/memory/buffer/OrderBasedMemoryBufferTest.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.memory.buffer;
import org.activemq.memory.buffer.MessageBuffer;
diff --git a/activemq-core/src/test/java/org/activemq/memory/buffer/SizeBasedMessageBufferTest.java b/activemq-core/src/test/java/org/activemq/memory/buffer/SizeBasedMessageBufferTest.java
index f0bce5d747..437e976da4 100644
--- a/activemq-core/src/test/java/org/activemq/memory/buffer/SizeBasedMessageBufferTest.java
+++ b/activemq-core/src/test/java/org/activemq/memory/buffer/SizeBasedMessageBufferTest.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.memory.buffer;
import org.activemq.memory.buffer.MessageBuffer;
diff --git a/activemq-core/src/test/java/org/activemq/network/DemandForwardingBridgeTest.java b/activemq-core/src/test/java/org/activemq/network/DemandForwardingBridgeTest.java
index 158adbcc0e..5f87f05d5d 100755
--- a/activemq-core/src/test/java/org/activemq/network/DemandForwardingBridgeTest.java
+++ b/activemq-core/src/test/java/org/activemq/network/DemandForwardingBridgeTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.network;
import javax.jms.DeliveryMode;
diff --git a/activemq-core/src/test/java/org/activemq/network/ForwardingBridgeTest.java b/activemq-core/src/test/java/org/activemq/network/ForwardingBridgeTest.java
index 65bc35e9ff..6a4b25c577 100755
--- a/activemq-core/src/test/java/org/activemq/network/ForwardingBridgeTest.java
+++ b/activemq-core/src/test/java/org/activemq/network/ForwardingBridgeTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.network;
import javax.jms.DeliveryMode;
diff --git a/activemq-core/src/test/java/org/activemq/network/NetworkTestSupport.java b/activemq-core/src/test/java/org/activemq/network/NetworkTestSupport.java
index 1aa48c2398..86dce26a15 100755
--- a/activemq-core/src/test/java/org/activemq/network/NetworkTestSupport.java
+++ b/activemq-core/src/test/java/org/activemq/network/NetworkTestSupport.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.network;
import java.io.IOException;
diff --git a/activemq-core/src/test/java/org/activemq/network/jms/QueueBridgeTest.java b/activemq-core/src/test/java/org/activemq/network/jms/QueueBridgeTest.java
index 7b28bdf4e6..a58f7f3eba 100755
--- a/activemq-core/src/test/java/org/activemq/network/jms/QueueBridgeTest.java
+++ b/activemq-core/src/test/java/org/activemq/network/jms/QueueBridgeTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) RAJD Consultancy 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.network.jms;
import java.net.URI;
diff --git a/activemq-core/src/test/java/org/activemq/network/jms/TopicBridgeSpringTest.java b/activemq-core/src/test/java/org/activemq/network/jms/TopicBridgeSpringTest.java
index 34318584a5..d2afb6b0ea 100755
--- a/activemq-core/src/test/java/org/activemq/network/jms/TopicBridgeSpringTest.java
+++ b/activemq-core/src/test/java/org/activemq/network/jms/TopicBridgeSpringTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) RAJD Consultancy 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.network.jms;
import javax.jms.Destination;
diff --git a/activemq-core/src/test/java/org/activemq/network/jms/TopicBridgeXBeanTest.java b/activemq-core/src/test/java/org/activemq/network/jms/TopicBridgeXBeanTest.java
index fd76ca868a..bebdc3150e 100644
--- a/activemq-core/src/test/java/org/activemq/network/jms/TopicBridgeXBeanTest.java
+++ b/activemq-core/src/test/java/org/activemq/network/jms/TopicBridgeXBeanTest.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.network.jms;
import org.springframework.context.support.AbstractApplicationContext;
diff --git a/activemq-core/src/test/java/org/activemq/openwire/BrokerInfoData.java b/activemq-core/src/test/java/org/activemq/openwire/BrokerInfoData.java
index 324b94d16c..a4d3e73840 100644
--- a/activemq-core/src/test/java/org/activemq/openwire/BrokerInfoData.java
+++ b/activemq-core/src/test/java/org/activemq/openwire/BrokerInfoData.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activemq.openwire;
import org.activemq.command.BrokerId;
diff --git a/activemq-core/src/test/java/org/activemq/openwire/DataFileGenerator.java b/activemq-core/src/test/java/org/activemq/openwire/DataFileGenerator.java
index a95d61f14a..bcd1b7a7a0 100644
--- a/activemq-core/src/test/java/org/activemq/openwire/DataFileGenerator.java
+++ b/activemq-core/src/test/java/org/activemq/openwire/DataFileGenerator.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activemq.openwire;
import java.io.ByteArrayInputStream;
diff --git a/activemq-core/src/test/java/org/activemq/openwire/ItStillMarshallsTheSameTest.java b/activemq-core/src/test/java/org/activemq/openwire/ItStillMarshallsTheSameTest.java
index d45325dc68..700415540f 100644
--- a/activemq-core/src/test/java/org/activemq/openwire/ItStillMarshallsTheSameTest.java
+++ b/activemq-core/src/test/java/org/activemq/openwire/ItStillMarshallsTheSameTest.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activemq.openwire;
import junit.framework.TestCase;
diff --git a/activemq-core/src/test/java/org/activemq/openwire/WireFormatInfoData.java b/activemq-core/src/test/java/org/activemq/openwire/WireFormatInfoData.java
index ab83935a00..57f359a4e0 100644
--- a/activemq-core/src/test/java/org/activemq/openwire/WireFormatInfoData.java
+++ b/activemq-core/src/test/java/org/activemq/openwire/WireFormatInfoData.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activemq.openwire;
import org.activemq.command.WireFormatInfo;
diff --git a/activemq-core/src/test/java/org/activemq/perf/PerfConsumer.java b/activemq-core/src/test/java/org/activemq/perf/PerfConsumer.java
index d392bc5af2..c5ebf31630 100644
--- a/activemq-core/src/test/java/org/activemq/perf/PerfConsumer.java
+++ b/activemq-core/src/test/java/org/activemq/perf/PerfConsumer.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.perf;
diff --git a/activemq-core/src/test/java/org/activemq/perf/PerfProducer.java b/activemq-core/src/test/java/org/activemq/perf/PerfProducer.java
index 3750fcc0ad..d0273af55f 100644
--- a/activemq-core/src/test/java/org/activemq/perf/PerfProducer.java
+++ b/activemq-core/src/test/java/org/activemq/perf/PerfProducer.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.perf;
diff --git a/activemq-core/src/test/java/org/activemq/perf/PerfRate.java b/activemq-core/src/test/java/org/activemq/perf/PerfRate.java
index 1989186c77..87e1565cf7 100644
--- a/activemq-core/src/test/java/org/activemq/perf/PerfRate.java
+++ b/activemq-core/src/test/java/org/activemq/perf/PerfRate.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.perf;
diff --git a/activemq-core/src/test/java/org/activemq/perf/SimpleDurableTopicTest.java b/activemq-core/src/test/java/org/activemq/perf/SimpleDurableTopicTest.java
index 27c72a1b00..d3a2b42fd8 100644
--- a/activemq-core/src/test/java/org/activemq/perf/SimpleDurableTopicTest.java
+++ b/activemq-core/src/test/java/org/activemq/perf/SimpleDurableTopicTest.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.perf;
diff --git a/activemq-core/src/test/java/org/activemq/perf/SimpleNonPersistentQueueTest.java b/activemq-core/src/test/java/org/activemq/perf/SimpleNonPersistentQueueTest.java
index 12f0074a1b..c508b9a8de 100644
--- a/activemq-core/src/test/java/org/activemq/perf/SimpleNonPersistentQueueTest.java
+++ b/activemq-core/src/test/java/org/activemq/perf/SimpleNonPersistentQueueTest.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.perf;
diff --git a/activemq-core/src/test/java/org/activemq/perf/SimpleNonPersistentTopicTest.java b/activemq-core/src/test/java/org/activemq/perf/SimpleNonPersistentTopicTest.java
index 6c97f22d78..c533fea63b 100644
--- a/activemq-core/src/test/java/org/activemq/perf/SimpleNonPersistentTopicTest.java
+++ b/activemq-core/src/test/java/org/activemq/perf/SimpleNonPersistentTopicTest.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.perf;
diff --git a/activemq-core/src/test/java/org/activemq/perf/SimpleQueueTest.java b/activemq-core/src/test/java/org/activemq/perf/SimpleQueueTest.java
index c17b2df00d..91ba399c84 100644
--- a/activemq-core/src/test/java/org/activemq/perf/SimpleQueueTest.java
+++ b/activemq-core/src/test/java/org/activemq/perf/SimpleQueueTest.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.perf;
diff --git a/activemq-core/src/test/java/org/activemq/perf/SimpleTopicTest.java b/activemq-core/src/test/java/org/activemq/perf/SimpleTopicTest.java
index 5db0547da1..cdd7035e7d 100644
--- a/activemq-core/src/test/java/org/activemq/perf/SimpleTopicTest.java
+++ b/activemq-core/src/test/java/org/activemq/perf/SimpleTopicTest.java
@@ -1,17 +1,18 @@
/**
- * ActiveMQ: The Open Source Message Fabric
- *
- * Copyright 2005 (C) Simula Labs Inc.
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.activemq.perf;
diff --git a/activemq-core/src/test/java/org/activemq/pool/JmsSendReceiveTwoConnectionsWithSenderUsingPoolTest.java b/activemq-core/src/test/java/org/activemq/pool/JmsSendReceiveTwoConnectionsWithSenderUsingPoolTest.java
index 90e2440403..a673e28196 100755
--- a/activemq-core/src/test/java/org/activemq/pool/JmsSendReceiveTwoConnectionsWithSenderUsingPoolTest.java
+++ b/activemq-core/src/test/java/org/activemq/pool/JmsSendReceiveTwoConnectionsWithSenderUsingPoolTest.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.pool;
import org.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
diff --git a/activemq-core/src/test/java/org/activemq/proxy/ProxyConnectorTest.java b/activemq-core/src/test/java/org/activemq/proxy/ProxyConnectorTest.java
index ba90de4779..71da2543fc 100755
--- a/activemq-core/src/test/java/org/activemq/proxy/ProxyConnectorTest.java
+++ b/activemq-core/src/test/java/org/activemq/proxy/ProxyConnectorTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.proxy;
import javax.jms.DeliveryMode;
diff --git a/activemq-core/src/test/java/org/activemq/proxy/ProxyTestSupport.java b/activemq-core/src/test/java/org/activemq/proxy/ProxyTestSupport.java
index d54e77ecb9..14da690ca3 100755
--- a/activemq-core/src/test/java/org/activemq/proxy/ProxyTestSupport.java
+++ b/activemq-core/src/test/java/org/activemq/proxy/ProxyTestSupport.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.proxy;
import java.net.URI;
diff --git a/activemq-core/src/test/java/org/activemq/security/SimpleSecurityBrokerSystemTest.java b/activemq-core/src/test/java/org/activemq/security/SimpleSecurityBrokerSystemTest.java
index 623d656ee8..4811bef1d3 100644
--- a/activemq-core/src/test/java/org/activemq/security/SimpleSecurityBrokerSystemTest.java
+++ b/activemq-core/src/test/java/org/activemq/security/SimpleSecurityBrokerSystemTest.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activemq.security;
import java.io.IOException;
diff --git a/activemq-core/src/test/java/org/activemq/selector/SelectorParserTest.java b/activemq-core/src/test/java/org/activemq/selector/SelectorParserTest.java
index fa253cd7f3..ce6ba1fbed 100755
--- a/activemq-core/src/test/java/org/activemq/selector/SelectorParserTest.java
+++ b/activemq-core/src/test/java/org/activemq/selector/SelectorParserTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.selector;
import junit.framework.TestCase;
diff --git a/activemq-core/src/test/java/org/activemq/selector/SelectorTest.java b/activemq-core/src/test/java/org/activemq/selector/SelectorTest.java
index 8da08aa213..e8df861108 100755
--- a/activemq-core/src/test/java/org/activemq/selector/SelectorTest.java
+++ b/activemq-core/src/test/java/org/activemq/selector/SelectorTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.selector;
import javax.jms.InvalidSelectorException;
diff --git a/activemq-core/src/test/java/org/activemq/simple/Consumer.java b/activemq-core/src/test/java/org/activemq/simple/Consumer.java
index 581c36781c..eb58ca55e3 100755
--- a/activemq-core/src/test/java/org/activemq/simple/Consumer.java
+++ b/activemq-core/src/test/java/org/activemq/simple/Consumer.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
/**
* The SimpleQueueSender class consists only of a main method,
diff --git a/activemq-core/src/test/java/org/activemq/simple/Producer.java b/activemq-core/src/test/java/org/activemq/simple/Producer.java
index 6966e28b78..bab7cbf7bb 100755
--- a/activemq-core/src/test/java/org/activemq/simple/Producer.java
+++ b/activemq-core/src/test/java/org/activemq/simple/Producer.java
@@ -1,22 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
-
+ *
+ * Copyright 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.
+ */
/**
* The SimpleQueueSender class consists only of a main method,
* which sends several messages to a queue.
diff --git a/activemq-core/src/test/java/org/activemq/spring/ConsumerBean.java b/activemq-core/src/test/java/org/activemq/spring/ConsumerBean.java
index 15031af09c..8f54924869 100755
--- a/activemq-core/src/test/java/org/activemq/spring/ConsumerBean.java
+++ b/activemq-core/src/test/java/org/activemq/spring/ConsumerBean.java
@@ -1,22 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
-
+ *
+ * Copyright 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.
+ */
package org.activemq.spring;
import javax.jms.Message;
diff --git a/activemq-core/src/test/java/org/activemq/spring/SpringConsumer.java b/activemq-core/src/test/java/org/activemq/spring/SpringConsumer.java
index 6ec8f45ed1..e688889016 100755
--- a/activemq-core/src/test/java/org/activemq/spring/SpringConsumer.java
+++ b/activemq-core/src/test/java/org/activemq/spring/SpringConsumer.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.spring;
diff --git a/activemq-core/src/test/java/org/activemq/spring/SpringProducer.java b/activemq-core/src/test/java/org/activemq/spring/SpringProducer.java
index c7bb98ede1..c551caac89 100755
--- a/activemq-core/src/test/java/org/activemq/spring/SpringProducer.java
+++ b/activemq-core/src/test/java/org/activemq/spring/SpringProducer.java
@@ -1,22 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
-
+ *
+ * Copyright 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.
+ */
package org.activemq.spring;
import org.springframework.jms.core.JmsTemplate;
diff --git a/activemq-core/src/test/java/org/activemq/spring/SpringTest.java b/activemq-core/src/test/java/org/activemq/spring/SpringTest.java
index 525b7710f2..ff9b5bada5 100755
--- a/activemq-core/src/test/java/org/activemq/spring/SpringTest.java
+++ b/activemq-core/src/test/java/org/activemq/spring/SpringTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.spring;
diff --git a/activemq-core/src/test/java/org/activemq/streams/JMSInputStreamTest.java b/activemq-core/src/test/java/org/activemq/streams/JMSInputStreamTest.java
index 435755c638..6f96f24bf5 100755
--- a/activemq-core/src/test/java/org/activemq/streams/JMSInputStreamTest.java
+++ b/activemq-core/src/test/java/org/activemq/streams/JMSInputStreamTest.java
@@ -1,10 +1,19 @@
-/*
- * Created on Feb 21, 2005
+/**
*
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
+ * Copyright 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.
*/
-
package org.activemq.streams;
import java.io.DataInputStream;
import java.io.DataOutputStream;
diff --git a/activemq-core/src/test/java/org/activemq/test/JmsResourceProvider.java b/activemq-core/src/test/java/org/activemq/test/JmsResourceProvider.java
index 6bb95d1bbe..65928588cd 100755
--- a/activemq-core/src/test/java/org/activemq/test/JmsResourceProvider.java
+++ b/activemq-core/src/test/java/org/activemq/test/JmsResourceProvider.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.test;
import javax.jms.Connection;
diff --git a/activemq-core/src/test/java/org/activemq/test/JmsSendReceiveTestSupport.java b/activemq-core/src/test/java/org/activemq/test/JmsSendReceiveTestSupport.java
index d159ecf014..e55f510b0f 100755
--- a/activemq-core/src/test/java/org/activemq/test/JmsSendReceiveTestSupport.java
+++ b/activemq-core/src/test/java/org/activemq/test/JmsSendReceiveTestSupport.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.test;
import javax.jms.DeliveryMode;
diff --git a/activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveTest.java b/activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveTest.java
index 3d2330e158..ed9c49e572 100755
--- a/activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveTest.java
+++ b/activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.test;
import javax.jms.Connection;
diff --git a/activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java b/activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java
index b058d7b750..17563b01bd 100644
--- a/activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java
+++ b/activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.test;
import org.activemq.ActiveMQConnectionFactory;
diff --git a/activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java b/activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java
index 33e21c3032..2af5e07cb4 100644
--- a/activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java
+++ b/activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.test;
import org.activemq.ActiveMQConnectionFactory;
diff --git a/activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveWithTwoConnectionsTest.java b/activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveWithTwoConnectionsTest.java
index 059f6cc9f0..8c1dace6db 100755
--- a/activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveWithTwoConnectionsTest.java
+++ b/activemq-core/src/test/java/org/activemq/test/JmsTopicSendReceiveWithTwoConnectionsTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.test;
import javax.jms.Connection;
diff --git a/activemq-core/src/test/java/org/activemq/test/TestSupport.java b/activemq-core/src/test/java/org/activemq/test/TestSupport.java
index f0f133e5bc..ce23210435 100755
--- a/activemq-core/src/test/java/org/activemq/test/TestSupport.java
+++ b/activemq-core/src/test/java/org/activemq/test/TestSupport.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.test;
import junit.framework.TestCase;
diff --git a/activemq-core/src/test/java/org/activemq/test/retroactive/DummyMessageQuery.java b/activemq-core/src/test/java/org/activemq/test/retroactive/DummyMessageQuery.java
index b6284246b8..199dff78fe 100644
--- a/activemq-core/src/test/java/org/activemq/test/retroactive/DummyMessageQuery.java
+++ b/activemq-core/src/test/java/org/activemq/test/retroactive/DummyMessageQuery.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.test.retroactive;
import org.activemq.broker.region.policy.MessageQuery;
diff --git a/activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerTestWithDestinationBasedBufferTest.java b/activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerTestWithDestinationBasedBufferTest.java
index 528a6387ff..caf3878ce4 100644
--- a/activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerTestWithDestinationBasedBufferTest.java
+++ b/activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerTestWithDestinationBasedBufferTest.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.test.retroactive;
/**
diff --git a/activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerTestWithSimpleMessageListTest.java b/activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerTestWithSimpleMessageListTest.java
index 66df90dcca..e56153d224 100644
--- a/activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerTestWithSimpleMessageListTest.java
+++ b/activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerTestWithSimpleMessageListTest.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.test.retroactive;
import org.activemq.ActiveMQConnectionFactory;
diff --git a/activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerTestWithTimePolicyTest.java b/activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerTestWithTimePolicyTest.java
index 865a9fbc1a..4568bc83e1 100644
--- a/activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerTestWithTimePolicyTest.java
+++ b/activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerTestWithTimePolicyTest.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.test.retroactive;
/**
diff --git a/activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerWithMessageQueryTest.java b/activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerWithMessageQueryTest.java
index e5e41e56f0..f423ecfaa8 100644
--- a/activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerWithMessageQueryTest.java
+++ b/activemq-core/src/test/java/org/activemq/test/retroactive/RetroactiveConsumerWithMessageQueryTest.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.test.retroactive;
import org.activemq.ActiveMQConnectionFactory;
diff --git a/activemq-core/src/test/java/org/activemq/thread/TaskRunnerTest.java b/activemq-core/src/test/java/org/activemq/thread/TaskRunnerTest.java
index 4db1050ddb..9c4fc2460f 100755
--- a/activemq-core/src/test/java/org/activemq/thread/TaskRunnerTest.java
+++ b/activemq-core/src/test/java/org/activemq/thread/TaskRunnerTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.thread;
import junit.framework.TestCase;
diff --git a/activemq-core/src/test/java/org/activemq/transport/TransportBrokerTestSupport.java b/activemq-core/src/test/java/org/activemq/transport/TransportBrokerTestSupport.java
index 3f9257d43f..6e76af77fb 100755
--- a/activemq-core/src/test/java/org/activemq/transport/TransportBrokerTestSupport.java
+++ b/activemq-core/src/test/java/org/activemq/transport/TransportBrokerTestSupport.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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;
import java.net.URI;
diff --git a/activemq-core/src/test/java/org/activemq/transport/activeio/NIOActiveIOTransportBrokerTest.java b/activemq-core/src/test/java/org/activemq/transport/activeio/NIOActiveIOTransportBrokerTest.java
index b548208c04..96b7993541 100644
--- a/activemq-core/src/test/java/org/activemq/transport/activeio/NIOActiveIOTransportBrokerTest.java
+++ b/activemq-core/src/test/java/org/activemq/transport/activeio/NIOActiveIOTransportBrokerTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport.activeio;
import org.activemq.transport.TransportBrokerTestSupport;
diff --git a/activemq-core/src/test/java/org/activemq/transport/activeio/TCPActiveIOTransportBrokerTest.java b/activemq-core/src/test/java/org/activemq/transport/activeio/TCPActiveIOTransportBrokerTest.java
index 27bc731217..f58c7714cb 100755
--- a/activemq-core/src/test/java/org/activemq/transport/activeio/TCPActiveIOTransportBrokerTest.java
+++ b/activemq-core/src/test/java/org/activemq/transport/activeio/TCPActiveIOTransportBrokerTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport.activeio;
import org.activemq.transport.TransportBrokerTestSupport;
diff --git a/activemq-core/src/test/java/org/activemq/transport/discovery/DiscoveryTransportBrokerTest.java b/activemq-core/src/test/java/org/activemq/transport/discovery/DiscoveryTransportBrokerTest.java
index c4f958a95e..16e919ab3f 100755
--- a/activemq-core/src/test/java/org/activemq/transport/discovery/DiscoveryTransportBrokerTest.java
+++ b/activemq-core/src/test/java/org/activemq/transport/discovery/DiscoveryTransportBrokerTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport.discovery;
import java.io.IOException;
diff --git a/activemq-core/src/test/java/org/activemq/transport/failover/BadConnectionTest.java b/activemq-core/src/test/java/org/activemq/transport/failover/BadConnectionTest.java
index a48c75332c..975bff8ce3 100644
--- a/activemq-core/src/test/java/org/activemq/transport/failover/BadConnectionTest.java
+++ b/activemq-core/src/test/java/org/activemq/transport/failover/BadConnectionTest.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.failover;
import org.activemq.command.ActiveMQMessage;
diff --git a/activemq-core/src/test/java/org/activemq/transport/failover/FailoverTransportBrokerTest.java b/activemq-core/src/test/java/org/activemq/transport/failover/FailoverTransportBrokerTest.java
index 82d200e543..822d48d493 100755
--- a/activemq-core/src/test/java/org/activemq/transport/failover/FailoverTransportBrokerTest.java
+++ b/activemq-core/src/test/java/org/activemq/transport/failover/FailoverTransportBrokerTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport.failover;
import java.net.URI;
diff --git a/activemq-core/src/test/java/org/activemq/transport/fanout/FanoutTransportBrokerTest.java b/activemq-core/src/test/java/org/activemq/transport/fanout/FanoutTransportBrokerTest.java
index 212d85c873..86d9d817af 100755
--- a/activemq-core/src/test/java/org/activemq/transport/fanout/FanoutTransportBrokerTest.java
+++ b/activemq-core/src/test/java/org/activemq/transport/fanout/FanoutTransportBrokerTest.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.fanout;
import java.io.IOException;
diff --git a/activemq-core/src/test/java/org/activemq/transport/peer/PeerTransportTest.java b/activemq-core/src/test/java/org/activemq/transport/peer/PeerTransportTest.java
index be9e2ea40f..a033e55c64 100755
--- a/activemq-core/src/test/java/org/activemq/transport/peer/PeerTransportTest.java
+++ b/activemq-core/src/test/java/org/activemq/transport/peer/PeerTransportTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2005 Simula Labs, 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.peer;
import org.activemq.ActiveMQConnectionFactory;
diff --git a/activemq-core/src/test/java/org/activemq/transport/stomp/StompTest.java b/activemq-core/src/test/java/org/activemq/transport/stomp/StompTest.java
index 868cc9fb2f..0694f3e83e 100644
--- a/activemq-core/src/test/java/org/activemq/transport/stomp/StompTest.java
+++ b/activemq-core/src/test/java/org/activemq/transport/stomp/StompTest.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activemq.transport.stomp;
import java.io.ByteArrayOutputStream;
diff --git a/activemq-core/src/test/java/org/activemq/transport/stomp/StompWireFormatTest.java b/activemq-core/src/test/java/org/activemq/transport/stomp/StompWireFormatTest.java
index f62a86b070..23fdd3bf69 100644
--- a/activemq-core/src/test/java/org/activemq/transport/stomp/StompWireFormatTest.java
+++ b/activemq-core/src/test/java/org/activemq/transport/stomp/StompWireFormatTest.java
@@ -1,5 +1,18 @@
-/*
- * Copyright (c) 2005 Your Corporation. All Rights Reserved.
+/**
+ *
+ * Copyright 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.
*/
package org.activemq.transport.stomp;
diff --git a/activemq-core/src/test/java/org/activemq/transport/tcp/TcpTransportBrokerTest.java b/activemq-core/src/test/java/org/activemq/transport/tcp/TcpTransportBrokerTest.java
index 866b6628c1..0c93996d9c 100755
--- a/activemq-core/src/test/java/org/activemq/transport/tcp/TcpTransportBrokerTest.java
+++ b/activemq-core/src/test/java/org/activemq/transport/tcp/TcpTransportBrokerTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport.tcp;
import org.activemq.transport.TransportBrokerTestSupport;
diff --git a/activemq-core/src/test/java/org/activemq/transport/vm/VMTransportBrokerTest.java b/activemq-core/src/test/java/org/activemq/transport/vm/VMTransportBrokerTest.java
index 40b3555b33..1559d1581d 100755
--- a/activemq-core/src/test/java/org/activemq/transport/vm/VMTransportBrokerTest.java
+++ b/activemq-core/src/test/java/org/activemq/transport/vm/VMTransportBrokerTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport.vm;
import org.activemq.transport.TransportBrokerTestSupport;
diff --git a/activemq-core/src/test/java/org/activemq/transport/vm/VMTransportEmbeddedBrokerTest.java b/activemq-core/src/test/java/org/activemq/transport/vm/VMTransportEmbeddedBrokerTest.java
index 049a97c8d0..dbead8f95a 100755
--- a/activemq-core/src/test/java/org/activemq/transport/vm/VMTransportEmbeddedBrokerTest.java
+++ b/activemq-core/src/test/java/org/activemq/transport/vm/VMTransportEmbeddedBrokerTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.transport.vm;
import java.net.URI;
diff --git a/activemq-core/src/test/java/org/activemq/util/MessageList.java b/activemq-core/src/test/java/org/activemq/util/MessageList.java
index 3bbf7e989c..9b6ac37155 100644
--- a/activemq-core/src/test/java/org/activemq/util/MessageList.java
+++ b/activemq-core/src/test/java/org/activemq/util/MessageList.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.util;
import java.util.ArrayList;
diff --git a/activemq-core/src/test/java/org/activemq/util/ReflectionSupportTest.java b/activemq-core/src/test/java/org/activemq/util/ReflectionSupportTest.java
index 46bfee2f5e..e68445f041 100755
--- a/activemq-core/src/test/java/org/activemq/util/ReflectionSupportTest.java
+++ b/activemq-core/src/test/java/org/activemq/util/ReflectionSupportTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.util;
import java.net.URI;
diff --git a/activemq-core/src/test/java/org/activemq/util/SimplePojo.java b/activemq-core/src/test/java/org/activemq/util/SimplePojo.java
index df7f3851a3..55201037cf 100755
--- a/activemq-core/src/test/java/org/activemq/util/SimplePojo.java
+++ b/activemq-core/src/test/java/org/activemq/util/SimplePojo.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.util;
import java.net.URI;
diff --git a/activemq-core/src/test/java/org/activemq/util/URISupportTest.java b/activemq-core/src/test/java/org/activemq/util/URISupportTest.java
index 7acda7bba6..e05b3490d2 100644
--- a/activemq-core/src/test/java/org/activemq/util/URISupportTest.java
+++ b/activemq-core/src/test/java/org/activemq/util/URISupportTest.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.util;
import java.net.URI;
diff --git a/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithEmbeddedBrokerAndPersistenceTest.java b/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithEmbeddedBrokerAndPersistenceTest.java
index e6ebceaef1..b6a3b99635 100644
--- a/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithEmbeddedBrokerAndPersistenceTest.java
+++ b/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithEmbeddedBrokerAndPersistenceTest.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.xbean;
/**
diff --git a/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java b/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java
index 7e5b18bbc7..229ac6fed3 100644
--- a/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java
+++ b/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithEmbeddedBrokerTest.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.xbean;
import org.activemq.EmbeddedBrokerTestSupport;
diff --git a/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java b/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java
index dac5df6b96..9acb5eaa5c 100644
--- a/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java
+++ b/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithSpringFactoryBeanTest.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.xbean;
import org.activemq.ActiveMQConnectionFactory;
diff --git a/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithSpringXBeanFactoryBeanTest.java b/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithSpringXBeanFactoryBeanTest.java
index c9cd4a599e..214b6e26b9 100644
--- a/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithSpringXBeanFactoryBeanTest.java
+++ b/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithSpringXBeanFactoryBeanTest.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.xbean;
import org.activemq.broker.BrokerService;
diff --git a/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithXBeanFactoryBeanTest.java b/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithXBeanFactoryBeanTest.java
index acb8cf9b05..f457ff738e 100644
--- a/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithXBeanFactoryBeanTest.java
+++ b/activemq-core/src/test/java/org/activemq/xbean/MultipleTestsWithXBeanFactoryBeanTest.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.xbean;
import org.activemq.broker.BrokerService;
diff --git a/activemq-core/src/test/java/org/activemq/xbean/XBeanConfigTest.java b/activemq-core/src/test/java/org/activemq/xbean/XBeanConfigTest.java
index 6c5b0fe0f8..8e9eb27d96 100644
--- a/activemq-core/src/test/java/org/activemq/xbean/XBeanConfigTest.java
+++ b/activemq-core/src/test/java/org/activemq/xbean/XBeanConfigTest.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.xbean;
import org.activemq.broker.Broker;
diff --git a/activemq-core/src/test/java/org/activemq/xbean/XBeanXmlTest.java b/activemq-core/src/test/java/org/activemq/xbean/XBeanXmlTest.java
index ec8b726410..4c2515d13a 100755
--- a/activemq-core/src/test/java/org/activemq/xbean/XBeanXmlTest.java
+++ b/activemq-core/src/test/java/org/activemq/xbean/XBeanXmlTest.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -14,9 +13,7 @@
* 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.xbean;
import org.activemq.broker.SpringTest;
diff --git a/activemq-jaas/src/main/java/org/activemq/jaas/GroupPrincipal.java b/activemq-jaas/src/main/java/org/activemq/jaas/GroupPrincipal.java
index 46ee389b37..c142384a30 100644
--- a/activemq-jaas/src/main/java/org/activemq/jaas/GroupPrincipal.java
+++ b/activemq-jaas/src/main/java/org/activemq/jaas/GroupPrincipal.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
diff --git a/activemq-jaas/src/main/java/org/activemq/jaas/LDAPLoginModule.java b/activemq-jaas/src/main/java/org/activemq/jaas/LDAPLoginModule.java
index a02aaae51d..c5f175c86b 100644
--- a/activemq-jaas/src/main/java/org/activemq/jaas/LDAPLoginModule.java
+++ b/activemq-jaas/src/main/java/org/activemq/jaas/LDAPLoginModule.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
diff --git a/activemq-jaas/src/main/java/org/activemq/jaas/PropertiesLoginModule.java b/activemq-jaas/src/main/java/org/activemq/jaas/PropertiesLoginModule.java
index 0237341b9c..6cbda8bfcb 100644
--- a/activemq-jaas/src/main/java/org/activemq/jaas/PropertiesLoginModule.java
+++ b/activemq-jaas/src/main/java/org/activemq/jaas/PropertiesLoginModule.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
diff --git a/activemq-jaas/src/main/java/org/activemq/jaas/UserPrincipal.java b/activemq-jaas/src/main/java/org/activemq/jaas/UserPrincipal.java
index 21817a1194..e97e1cc170 100644
--- a/activemq-jaas/src/main/java/org/activemq/jaas/UserPrincipal.java
+++ b/activemq-jaas/src/main/java/org/activemq/jaas/UserPrincipal.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
diff --git a/activemq-jaas/src/test/java/org/activemq/jaas/GroupPrincipalTest.java b/activemq-jaas/src/test/java/org/activemq/jaas/GroupPrincipalTest.java
index 2f2e441f8f..bdd9cabe1d 100644
--- a/activemq-jaas/src/test/java/org/activemq/jaas/GroupPrincipalTest.java
+++ b/activemq-jaas/src/test/java/org/activemq/jaas/GroupPrincipalTest.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
diff --git a/activemq-jaas/src/test/java/org/activemq/jaas/LDAPLoginModuleTest.java b/activemq-jaas/src/test/java/org/activemq/jaas/LDAPLoginModuleTest.java
index a3eb30da04..7eb5cedb17 100644
--- a/activemq-jaas/src/test/java/org/activemq/jaas/LDAPLoginModuleTest.java
+++ b/activemq-jaas/src/test/java/org/activemq/jaas/LDAPLoginModuleTest.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
diff --git a/activemq-jaas/src/test/java/org/activemq/jaas/PropertiesLoginModuleTest.java b/activemq-jaas/src/test/java/org/activemq/jaas/PropertiesLoginModuleTest.java
index 223050c4f7..c8a79825a6 100644
--- a/activemq-jaas/src/test/java/org/activemq/jaas/PropertiesLoginModuleTest.java
+++ b/activemq-jaas/src/test/java/org/activemq/jaas/PropertiesLoginModuleTest.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
diff --git a/activemq-jaas/src/test/java/org/activemq/jaas/UserPrincipalTest.java b/activemq-jaas/src/test/java/org/activemq/jaas/UserPrincipalTest.java
index afc74d37cb..9de6890c28 100644
--- a/activemq-jaas/src/test/java/org/activemq/jaas/UserPrincipalTest.java
+++ b/activemq-jaas/src/test/java/org/activemq/jaas/UserPrincipalTest.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
diff --git a/activemq-jaas/src/test/java/org/activemq/jaas/ldap/MutableServerStartupConfiguration.java b/activemq-jaas/src/test/java/org/activemq/jaas/ldap/MutableServerStartupConfiguration.java
index 2081fff0bd..2676beab56 100644
--- a/activemq-jaas/src/test/java/org/activemq/jaas/ldap/MutableServerStartupConfiguration.java
+++ b/activemq-jaas/src/test/java/org/activemq/jaas/ldap/MutableServerStartupConfiguration.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2005 The Apache Software Foundation
+ * Copyright 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
+ * 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.
*/
package org.activemq.jaas.ldap;
diff --git a/activemq-jaas/src/test/java/org/activemq/jaas/ldap/ServerContextFactory.java b/activemq-jaas/src/test/java/org/activemq/jaas/ldap/ServerContextFactory.java
index 265764e5c2..bd129fcb81 100644
--- a/activemq-jaas/src/test/java/org/activemq/jaas/ldap/ServerContextFactory.java
+++ b/activemq-jaas/src/test/java/org/activemq/jaas/ldap/ServerContextFactory.java
@@ -1,7 +1,6 @@
/**
- * ActiveMQ: The Open Source Message Fabric
*
- * Copyright 2005 (C) LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -15,22 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- *
- * Copyright 2005 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.activemq.jaas.ldap;
import java.io.IOException;
diff --git a/activemq-jaas/src/test/java/org/activemq/jaas/ldap/ServerStartupConfiguration.java b/activemq-jaas/src/test/java/org/activemq/jaas/ldap/ServerStartupConfiguration.java
index 08c0e9c17c..6f6f504205 100644
--- a/activemq-jaas/src/test/java/org/activemq/jaas/ldap/ServerStartupConfiguration.java
+++ b/activemq-jaas/src/test/java/org/activemq/jaas/ldap/ServerStartupConfiguration.java
@@ -1,18 +1,18 @@
/**
*
- * Copyright 2005 The Apache Software Foundation
+ * Copyright 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
+ * 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.
*/
package org.activemq.jaas.ldap;
diff --git a/activemq-ra/src/main/java/org/activemq/ra/ActiveMQActivationSpec.java b/activemq-ra/src/main/java/org/activemq/ra/ActiveMQActivationSpec.java
index 70aaf8864c..9b3e7799e5 100755
--- a/activemq-ra/src/main/java/org/activemq/ra/ActiveMQActivationSpec.java
+++ b/activemq-ra/src/main/java/org/activemq/ra/ActiveMQActivationSpec.java
@@ -1,10 +1,8 @@
/**
*
- * Copyright 2004 Hiram Chirino
- * Copyright 2005 LogicBlaze Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Copyright 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
*
@@ -15,8 +13,7 @@
* 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.ra;
import java.beans.IntrospectionException;
diff --git a/activemq-ra/src/main/java/org/activemq/ra/ActiveMQConnectionFactory.java b/activemq-ra/src/main/java/org/activemq/ra/ActiveMQConnectionFactory.java
index d3d725bf60..02b2739105 100755
--- a/activemq-ra/src/main/java/org/activemq/ra/ActiveMQConnectionFactory.java
+++ b/activemq-ra/src/main/java/org/activemq/ra/ActiveMQConnectionFactory.java
@@ -1,21 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- * Copyright 2005 LogicBlaze Inc.
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.ra;
import org.apache.commons.logging.Log;
diff --git a/activemq-ra/src/main/java/org/activemq/ra/ActiveMQConnectionRequestInfo.java b/activemq-ra/src/main/java/org/activemq/ra/ActiveMQConnectionRequestInfo.java
index 8a85ff880a..88f5e9fe0c 100755
--- a/activemq-ra/src/main/java/org/activemq/ra/ActiveMQConnectionRequestInfo.java
+++ b/activemq-ra/src/main/java/org/activemq/ra/ActiveMQConnectionRequestInfo.java
@@ -1,21 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- * Copyright 2005 LogicBlaze Inc.
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.ra;
import javax.resource.spi.ConnectionRequestInfo;
diff --git a/activemq-ra/src/main/java/org/activemq/ra/ActiveMQEndpointActivationKey.java b/activemq-ra/src/main/java/org/activemq/ra/ActiveMQEndpointActivationKey.java
index 4a8c986e7f..18fa14cadd 100755
--- a/activemq-ra/src/main/java/org/activemq/ra/ActiveMQEndpointActivationKey.java
+++ b/activemq-ra/src/main/java/org/activemq/ra/ActiveMQEndpointActivationKey.java
@@ -1,21 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- * Copyright 2005 LogicBlaze Inc.
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.ra;
import javax.resource.spi.endpoint.MessageEndpointFactory;
diff --git a/activemq-ra/src/main/java/org/activemq/ra/ActiveMQEndpointWorker.java b/activemq-ra/src/main/java/org/activemq/ra/ActiveMQEndpointWorker.java
index 4fd424efae..9737902715 100755
--- a/activemq-ra/src/main/java/org/activemq/ra/ActiveMQEndpointWorker.java
+++ b/activemq-ra/src/main/java/org/activemq/ra/ActiveMQEndpointWorker.java
@@ -1,7 +1,6 @@
/**
*
- * Copyright 2004 Hiram Chirino
- * Copyright 2005 LogicBlaze Inc.
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.ra;
import java.lang.reflect.Method;
diff --git a/activemq-ra/src/main/java/org/activemq/ra/ActiveMQManagedConnection.java b/activemq-ra/src/main/java/org/activemq/ra/ActiveMQManagedConnection.java
index aa8321de3e..d1b41101e5 100755
--- a/activemq-ra/src/main/java/org/activemq/ra/ActiveMQManagedConnection.java
+++ b/activemq-ra/src/main/java/org/activemq/ra/ActiveMQManagedConnection.java
@@ -1,7 +1,6 @@
/**
*
- * Copyright 2004 Hiram Chirino
- * Copyright 2005 LogicBlaze Inc.
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.ra;
import java.io.PrintWriter;
diff --git a/activemq-ra/src/main/java/org/activemq/ra/ActiveMQManagedConnectionFactory.java b/activemq-ra/src/main/java/org/activemq/ra/ActiveMQManagedConnectionFactory.java
index 5dc3592895..176c13d502 100755
--- a/activemq-ra/src/main/java/org/activemq/ra/ActiveMQManagedConnectionFactory.java
+++ b/activemq-ra/src/main/java/org/activemq/ra/ActiveMQManagedConnectionFactory.java
@@ -1,7 +1,6 @@
/**
*
- * Copyright 2004 Hiram Chirino
- * Copyright 2005 LogicBlaze Inc.
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.ra;
import java.io.PrintWriter;
diff --git a/activemq-ra/src/main/java/org/activemq/ra/ActiveMQResourceAdapter.java b/activemq-ra/src/main/java/org/activemq/ra/ActiveMQResourceAdapter.java
index 251f6b9250..876fe6aa4c 100755
--- a/activemq-ra/src/main/java/org/activemq/ra/ActiveMQResourceAdapter.java
+++ b/activemq-ra/src/main/java/org/activemq/ra/ActiveMQResourceAdapter.java
@@ -1,7 +1,6 @@
/**
*
- * Copyright 2004 Hiram Chirino
- * Copyright 2005 LogicBlaze Inc.
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.ra;
import java.net.URI;
diff --git a/activemq-ra/src/main/java/org/activemq/ra/InboundConnectionProxy.java b/activemq-ra/src/main/java/org/activemq/ra/InboundConnectionProxy.java
index 766d6270e3..3c8e6cb814 100755
--- a/activemq-ra/src/main/java/org/activemq/ra/InboundConnectionProxy.java
+++ b/activemq-ra/src/main/java/org/activemq/ra/InboundConnectionProxy.java
@@ -1,21 +1,19 @@
-/**
- *
- * Copyright 2004 Protique Ltd
- * Copyright 2005 LogicBlaze Inc.
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.ra;
import javax.jms.*;
diff --git a/activemq-ra/src/main/java/org/activemq/ra/InboundConnectionProxyFactory.java b/activemq-ra/src/main/java/org/activemq/ra/InboundConnectionProxyFactory.java
index fefaef10ab..616c085a9e 100755
--- a/activemq-ra/src/main/java/org/activemq/ra/InboundConnectionProxyFactory.java
+++ b/activemq-ra/src/main/java/org/activemq/ra/InboundConnectionProxyFactory.java
@@ -1,21 +1,19 @@
-/**
- *
- * Copyright 2004 Protique Ltd
- * Copyright 2005 LogicBlaze Inc.
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.ra;
import javax.jms.Connection;
diff --git a/activemq-ra/src/main/java/org/activemq/ra/InboundContext.java b/activemq-ra/src/main/java/org/activemq/ra/InboundContext.java
index 192ee52f39..ee3a6f8611 100755
--- a/activemq-ra/src/main/java/org/activemq/ra/InboundContext.java
+++ b/activemq-ra/src/main/java/org/activemq/ra/InboundContext.java
@@ -1,21 +1,19 @@
-/**
- *
- * Copyright 2004 Protique Ltd
- * Copyright 2005 LogicBlaze Inc.
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.ra;
import javax.jms.JMSException;
diff --git a/activemq-ra/src/main/java/org/activemq/ra/InboundContextSupport.java b/activemq-ra/src/main/java/org/activemq/ra/InboundContextSupport.java
index f2ad61c821..0966ca5789 100755
--- a/activemq-ra/src/main/java/org/activemq/ra/InboundContextSupport.java
+++ b/activemq-ra/src/main/java/org/activemq/ra/InboundContextSupport.java
@@ -1,21 +1,19 @@
-/**
- *
- * Copyright 2004 Protique Ltd
- * Copyright 2005 LogicBlaze Inc.
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.ra;
/**
diff --git a/activemq-ra/src/main/java/org/activemq/ra/InboundMessageProducerProxy.java b/activemq-ra/src/main/java/org/activemq/ra/InboundMessageProducerProxy.java
index 66fc62e461..958f04c848 100755
--- a/activemq-ra/src/main/java/org/activemq/ra/InboundMessageProducerProxy.java
+++ b/activemq-ra/src/main/java/org/activemq/ra/InboundMessageProducerProxy.java
@@ -1,21 +1,19 @@
-/**
- *
- * Copyright 2004 Protique Ltd
- * Copyright 2005 LogicBlaze Inc.
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.ra;
import javax.jms.Destination;
diff --git a/activemq-ra/src/main/java/org/activemq/ra/InvalidMessageEndpointException.java b/activemq-ra/src/main/java/org/activemq/ra/InvalidMessageEndpointException.java
index 9f389ca48f..11760d0fe4 100755
--- a/activemq-ra/src/main/java/org/activemq/ra/InvalidMessageEndpointException.java
+++ b/activemq-ra/src/main/java/org/activemq/ra/InvalidMessageEndpointException.java
@@ -1,21 +1,19 @@
-/**
- *
- * Copyright 2004 Michael Gaffney
- * Copyright 2005 LogicBlaze Inc.
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.ra;
/**
diff --git a/activemq-ra/src/main/java/org/activemq/ra/LocalAndXATransaction.java b/activemq-ra/src/main/java/org/activemq/ra/LocalAndXATransaction.java
index 4c9aa7cc0d..721418fcc9 100755
--- a/activemq-ra/src/main/java/org/activemq/ra/LocalAndXATransaction.java
+++ b/activemq-ra/src/main/java/org/activemq/ra/LocalAndXATransaction.java
@@ -1,7 +1,6 @@
/**
*
- * Copyright 2004 Hiram Chirino
- * Copyright 2005 LogicBlaze Inc.
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.ra;
import javax.jms.JMSException;
diff --git a/activemq-ra/src/main/java/org/activemq/ra/ManagedConnectionProxy.java b/activemq-ra/src/main/java/org/activemq/ra/ManagedConnectionProxy.java
index 048b7ab01e..1c1903987c 100755
--- a/activemq-ra/src/main/java/org/activemq/ra/ManagedConnectionProxy.java
+++ b/activemq-ra/src/main/java/org/activemq/ra/ManagedConnectionProxy.java
@@ -1,21 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- * Copyright 2005 LogicBlaze Inc.
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.ra;
import java.util.ArrayList;
diff --git a/activemq-ra/src/main/java/org/activemq/ra/ManagedSessionProxy.java b/activemq-ra/src/main/java/org/activemq/ra/ManagedSessionProxy.java
index 85c1f36cbf..f01f1dd1a1 100755
--- a/activemq-ra/src/main/java/org/activemq/ra/ManagedSessionProxy.java
+++ b/activemq-ra/src/main/java/org/activemq/ra/ManagedSessionProxy.java
@@ -1,21 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- * Copyright 2005 LogicBlaze Inc.
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.ra;
import java.io.Serializable;
diff --git a/activemq-ra/src/main/java/org/activemq/ra/ManagedTransactionContext.java b/activemq-ra/src/main/java/org/activemq/ra/ManagedTransactionContext.java
index 83bb79bef4..d1d2bba7db 100755
--- a/activemq-ra/src/main/java/org/activemq/ra/ManagedTransactionContext.java
+++ b/activemq-ra/src/main/java/org/activemq/ra/ManagedTransactionContext.java
@@ -1,21 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- * Copyright 2005 LogicBlaze Inc.
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.ra;
import javax.jms.JMSException;
diff --git a/activemq-ra/src/main/java/org/activemq/ra/MessageEndpointProxy.java b/activemq-ra/src/main/java/org/activemq/ra/MessageEndpointProxy.java
index ce0c6ebbff..8feba0705f 100755
--- a/activemq-ra/src/main/java/org/activemq/ra/MessageEndpointProxy.java
+++ b/activemq-ra/src/main/java/org/activemq/ra/MessageEndpointProxy.java
@@ -1,21 +1,19 @@
-/**
- *
- * Copyright 2004 Michael Gaffney
- * Copyright 2005 LogicBlaze Inc.
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.ra;
import java.lang.reflect.Method;
diff --git a/activemq-ra/src/main/java/org/activemq/ra/ServerSessionImpl.java b/activemq-ra/src/main/java/org/activemq/ra/ServerSessionImpl.java
index c941564a3a..98b5e51afd 100755
--- a/activemq-ra/src/main/java/org/activemq/ra/ServerSessionImpl.java
+++ b/activemq-ra/src/main/java/org/activemq/ra/ServerSessionImpl.java
@@ -1,21 +1,19 @@
-/**
- *
- * Copyright 2004 Protique Ltd
- * Copyright 2005 LogicBlaze Inc.
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.ra;
import java.lang.reflect.Method;
diff --git a/activemq-ra/src/main/java/org/activemq/ra/ServerSessionPoolImpl.java b/activemq-ra/src/main/java/org/activemq/ra/ServerSessionPoolImpl.java
index 6bd3044091..935b6529bd 100755
--- a/activemq-ra/src/main/java/org/activemq/ra/ServerSessionPoolImpl.java
+++ b/activemq-ra/src/main/java/org/activemq/ra/ServerSessionPoolImpl.java
@@ -1,7 +1,6 @@
/**
*
- * Copyright 2004 Hiram Chirino
- * Copyright 2005 LogicBlaze Inc.
+ * Copyright 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.
@@ -14,8 +13,7 @@
* 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.ra;
import java.util.ArrayList;
diff --git a/activemq-ra/src/main/java/org/activemq/ra/SimpleConnectionManager.java b/activemq-ra/src/main/java/org/activemq/ra/SimpleConnectionManager.java
index 2c4b444f4c..a72ee0f4ba 100755
--- a/activemq-ra/src/main/java/org/activemq/ra/SimpleConnectionManager.java
+++ b/activemq-ra/src/main/java/org/activemq/ra/SimpleConnectionManager.java
@@ -1,21 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- * Copyright 2005 LogicBlaze Inc.
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.ra;
import org.apache.commons.logging.Log;
diff --git a/activemq-ra/src/test/java/org/activemq/ra/ActiveMQActivationSpecTest.java b/activemq-ra/src/test/java/org/activemq/ra/ActiveMQActivationSpecTest.java
index e0f412ea95..42565cd414 100755
--- a/activemq-ra/src/test/java/org/activemq/ra/ActiveMQActivationSpecTest.java
+++ b/activemq-ra/src/test/java/org/activemq/ra/ActiveMQActivationSpecTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Michael Gaffney
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.ra;
import java.beans.IntrospectionException;
diff --git a/activemq-ra/src/test/java/org/activemq/ra/ActiveMQAsfEndpointWorkerTest.java b/activemq-ra/src/test/java/org/activemq/ra/ActiveMQAsfEndpointWorkerTest.java
index e969b8f633..272f6ef765 100755
--- a/activemq-ra/src/test/java/org/activemq/ra/ActiveMQAsfEndpointWorkerTest.java
+++ b/activemq-ra/src/test/java/org/activemq/ra/ActiveMQAsfEndpointWorkerTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Michael Gaffney
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.ra;
import org.jmock.cglib.Mock;
diff --git a/activemq-ra/src/test/java/org/activemq/ra/ActiveMQResourceAdapterJavaBeanEqualityTest.java b/activemq-ra/src/test/java/org/activemq/ra/ActiveMQResourceAdapterJavaBeanEqualityTest.java
index b18e07c293..c1335685e5 100755
--- a/activemq-ra/src/test/java/org/activemq/ra/ActiveMQResourceAdapterJavaBeanEqualityTest.java
+++ b/activemq-ra/src/test/java/org/activemq/ra/ActiveMQResourceAdapterJavaBeanEqualityTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Michael Gaffney
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.ra;
import junit.framework.TestCase;
diff --git a/activemq-ra/src/test/java/org/activemq/ra/ConnectionEventListenerAdapter.java b/activemq-ra/src/test/java/org/activemq/ra/ConnectionEventListenerAdapter.java
index 8c36f59ae0..3a5c0af6cc 100755
--- a/activemq-ra/src/test/java/org/activemq/ra/ConnectionEventListenerAdapter.java
+++ b/activemq-ra/src/test/java/org/activemq/ra/ConnectionEventListenerAdapter.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.ra;
import javax.resource.spi.ConnectionEvent;
diff --git a/activemq-ra/src/test/java/org/activemq/ra/ConnectionManagerAdapter.java b/activemq-ra/src/test/java/org/activemq/ra/ConnectionManagerAdapter.java
index 29909da550..e07b084ec8 100755
--- a/activemq-ra/src/test/java/org/activemq/ra/ConnectionManagerAdapter.java
+++ b/activemq-ra/src/test/java/org/activemq/ra/ConnectionManagerAdapter.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.ra;
import java.util.ArrayList;
diff --git a/activemq-ra/src/test/java/org/activemq/ra/MDBTest.java b/activemq-ra/src/test/java/org/activemq/ra/MDBTest.java
index ffe91e404a..7ce4661531 100644
--- a/activemq-ra/src/test/java/org/activemq/ra/MDBTest.java
+++ b/activemq-ra/src/test/java/org/activemq/ra/MDBTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2005 LogicBlaze Inc.
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.ra;
import java.io.ByteArrayOutputStream;
diff --git a/activemq-ra/src/test/java/org/activemq/ra/ManagedConnectionFactoryTest.java b/activemq-ra/src/test/java/org/activemq/ra/ManagedConnectionFactoryTest.java
index fbb791f633..d51250da1b 100755
--- a/activemq-ra/src/test/java/org/activemq/ra/ManagedConnectionFactoryTest.java
+++ b/activemq-ra/src/test/java/org/activemq/ra/ManagedConnectionFactoryTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.ra;
import java.io.Serializable;
diff --git a/activemq-ra/src/test/java/org/activemq/ra/ManagedConnectionTest.java b/activemq-ra/src/test/java/org/activemq/ra/ManagedConnectionTest.java
index c356c3444c..e110e1f0c8 100755
--- a/activemq-ra/src/test/java/org/activemq/ra/ManagedConnectionTest.java
+++ b/activemq-ra/src/test/java/org/activemq/ra/ManagedConnectionTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Hiram Chirino
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.ra;
import java.util.Timer;
diff --git a/activemq-ra/src/test/java/org/activemq/ra/MessageEndpointProxyTest.java b/activemq-ra/src/test/java/org/activemq/ra/MessageEndpointProxyTest.java
index 90d34825b1..dfa88f37b2 100755
--- a/activemq-ra/src/test/java/org/activemq/ra/MessageEndpointProxyTest.java
+++ b/activemq-ra/src/test/java/org/activemq/ra/MessageEndpointProxyTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * Copyright 2004 Michael Gaffney
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.ra;
import org.jmock.MockObjectTestCase;
diff --git a/activemq-ra/src/test/java/org/activemq/ra/ServerSessionImplTest.java b/activemq-ra/src/test/java/org/activemq/ra/ServerSessionImplTest.java
index b819e17436..56397685d3 100644
--- a/activemq-ra/src/test/java/org/activemq/ra/ServerSessionImplTest.java
+++ b/activemq-ra/src/test/java/org/activemq/ra/ServerSessionImplTest.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2005 Guillaume Nodet
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.ra;
import org.jmock.MockObjectTestCase;
diff --git a/activemq-web/src/main/java/org/activemq/web/ConnectionManager.java b/activemq-web/src/main/java/org/activemq/web/ConnectionManager.java
index 434851f9db..050095e597 100644
--- a/activemq-web/src/main/java/org/activemq/web/ConnectionManager.java
+++ b/activemq-web/src/main/java/org/activemq/web/ConnectionManager.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.web;
diff --git a/activemq-web/src/main/java/org/activemq/web/MessageServlet.java b/activemq-web/src/main/java/org/activemq/web/MessageServlet.java
index b70c701c91..d0e687cff2 100644
--- a/activemq-web/src/main/java/org/activemq/web/MessageServlet.java
+++ b/activemq-web/src/main/java/org/activemq/web/MessageServlet.java
@@ -1,20 +1,19 @@
-/**
+/**
+ *
+ * Copyright 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
*
- * 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
- *
* 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.web;
diff --git a/activemq-web/src/main/java/org/activemq/web/MessageServletSupport.java b/activemq-web/src/main/java/org/activemq/web/MessageServletSupport.java
index 2577513efc..441fc6580d 100644
--- a/activemq-web/src/main/java/org/activemq/web/MessageServletSupport.java
+++ b/activemq-web/src/main/java/org/activemq/web/MessageServletSupport.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.web;
diff --git a/activemq-web/src/main/java/org/activemq/web/NoDestinationSuppliedException.java b/activemq-web/src/main/java/org/activemq/web/NoDestinationSuppliedException.java
index 5c29612de4..577a399e92 100644
--- a/activemq-web/src/main/java/org/activemq/web/NoDestinationSuppliedException.java
+++ b/activemq-web/src/main/java/org/activemq/web/NoDestinationSuppliedException.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.web;
import javax.servlet.ServletException;
diff --git a/activemq-web/src/main/java/org/activemq/web/PortfolioPublishServlet.java b/activemq-web/src/main/java/org/activemq/web/PortfolioPublishServlet.java
index 78b92425a8..2352f10cd7 100644
--- a/activemq-web/src/main/java/org/activemq/web/PortfolioPublishServlet.java
+++ b/activemq-web/src/main/java/org/activemq/web/PortfolioPublishServlet.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.web;
import javax.jms.Destination;
diff --git a/activemq-web/src/main/java/org/activemq/web/SpringBrokerContextListener.java b/activemq-web/src/main/java/org/activemq/web/SpringBrokerContextListener.java
index a34d8f91ef..fb9fd3a5bd 100644
--- a/activemq-web/src/main/java/org/activemq/web/SpringBrokerContextListener.java
+++ b/activemq-web/src/main/java/org/activemq/web/SpringBrokerContextListener.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.web;
import org.activemq.broker.BrokerService;
diff --git a/activemq-web/src/main/java/org/activemq/web/WebClient.java b/activemq-web/src/main/java/org/activemq/web/WebClient.java
index 42acda2c52..84957bb0d0 100644
--- a/activemq-web/src/main/java/org/activemq/web/WebClient.java
+++ b/activemq-web/src/main/java/org/activemq/web/WebClient.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.web;
diff --git a/activemq-web/src/test/org/activemq/web/JettyServer.java b/activemq-web/src/test/org/activemq/web/JettyServer.java
index 37f5f1053c..8b7a359fc2 100644
--- a/activemq-web/src/test/org/activemq/web/JettyServer.java
+++ b/activemq-web/src/test/org/activemq/web/JettyServer.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.web;
diff --git a/assembly/src/release/example/src/ConsumerTool.java b/assembly/src/release/example/src/ConsumerTool.java
index bed65f62f1..6d39dd39f9 100755
--- a/assembly/src/release/example/src/ConsumerTool.java
+++ b/assembly/src/release/example/src/ConsumerTool.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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 javax.jms.Connection;
import javax.jms.ExceptionListener;
diff --git a/assembly/src/release/example/src/ProducerAndConsumerTool.java b/assembly/src/release/example/src/ProducerAndConsumerTool.java
index f58f352844..d7d6ff2009 100644
--- a/assembly/src/release/example/src/ProducerAndConsumerTool.java
+++ b/assembly/src/release/example/src/ProducerAndConsumerTool.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Protique Ltd
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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 javax.jms.Connection;
import javax.jms.JMSException;
diff --git a/assembly/src/release/example/src/ProducerTool.java b/assembly/src/release/example/src/ProducerTool.java
index dfce879a2a..e2e09790a5 100755
--- a/assembly/src/release/example/src/ProducerTool.java
+++ b/assembly/src/release/example/src/ProducerTool.java
@@ -1,21 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
-
+ * 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 javax.jms.Connection;
import javax.jms.DeliveryMode;
import javax.jms.JMSException;
diff --git a/assembly/src/release/example/src/ToolSupport.java b/assembly/src/release/example/src/ToolSupport.java
index 918e1ab744..9e70318f9a 100755
--- a/assembly/src/release/example/src/ToolSupport.java
+++ b/assembly/src/release/example/src/ToolSupport.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.activemq.ActiveMQConnection;
import org.activemq.ActiveMQConnectionFactory;
diff --git a/assembly/src/test/org/activemq/benchmark/BenchmarkSupport.java b/assembly/src/test/org/activemq/benchmark/BenchmarkSupport.java
index 11a9c95e3f..54df1f67bf 100755
--- a/assembly/src/test/org/activemq/benchmark/BenchmarkSupport.java
+++ b/assembly/src/test/org/activemq/benchmark/BenchmarkSupport.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Protique Ltd
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.benchmark;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
diff --git a/assembly/src/test/org/activemq/benchmark/Consumer.java b/assembly/src/test/org/activemq/benchmark/Consumer.java
index 51e40f449f..d974f48049 100755
--- a/assembly/src/test/org/activemq/benchmark/Consumer.java
+++ b/assembly/src/test/org/activemq/benchmark/Consumer.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Protique Ltd
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.benchmark;
import javax.jms.Destination;
diff --git a/assembly/src/test/org/activemq/benchmark/Producer.java b/assembly/src/test/org/activemq/benchmark/Producer.java
index 37c81f3e23..fb8d05a98b 100755
--- a/assembly/src/test/org/activemq/benchmark/Producer.java
+++ b/assembly/src/test/org/activemq/benchmark/Producer.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Protique Ltd
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.benchmark;
import javax.jms.DeliveryMode;
diff --git a/assembly/src/test/org/activemq/benchmark/ProducerConsumer.java b/assembly/src/test/org/activemq/benchmark/ProducerConsumer.java
index 1b5374f903..5c08f1fe09 100755
--- a/assembly/src/test/org/activemq/benchmark/ProducerConsumer.java
+++ b/assembly/src/test/org/activemq/benchmark/ProducerConsumer.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Protique Ltd
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.benchmark;
diff --git a/assembly/src/test/org/activemq/config/BrokerXmlConfigFromJNDITest.java b/assembly/src/test/org/activemq/config/BrokerXmlConfigFromJNDITest.java
index e8bd0d2411..84167ce6ea 100755
--- a/assembly/src/test/org/activemq/config/BrokerXmlConfigFromJNDITest.java
+++ b/assembly/src/test/org/activemq/config/BrokerXmlConfigFromJNDITest.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.config;
import org.activemq.ActiveMQConnectionFactory;
diff --git a/assembly/src/test/org/activemq/config/BrokerXmlConfigTest.java b/assembly/src/test/org/activemq/config/BrokerXmlConfigTest.java
index 2cf5529ea6..6112840ac3 100755
--- a/assembly/src/test/org/activemq/config/BrokerXmlConfigTest.java
+++ b/assembly/src/test/org/activemq/config/BrokerXmlConfigTest.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Protique Ltd
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.config;
import org.activemq.ActiveMQConnectionFactory;
diff --git a/assembly/src/test/org/activemq/config/ConfigTest.java b/assembly/src/test/org/activemq/config/ConfigTest.java
index a8bf9665fe..7175366d74 100755
--- a/assembly/src/test/org/activemq/config/ConfigTest.java
+++ b/assembly/src/test/org/activemq/config/ConfigTest.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.config;
import org.activemq.broker.BrokerService;
diff --git a/assembly/src/test/org/activemq/transport/QueueClusterTest.java b/assembly/src/test/org/activemq/transport/QueueClusterTest.java
index b8426893da..6933a78889 100755
--- a/assembly/src/test/org/activemq/transport/QueueClusterTest.java
+++ b/assembly/src/test/org/activemq/transport/QueueClusterTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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;
diff --git a/assembly/src/test/org/activemq/transport/TopicClusterTest.java b/assembly/src/test/org/activemq/transport/TopicClusterTest.java
index 75c45ccb0c..5afab32198 100755
--- a/assembly/src/test/org/activemq/transport/TopicClusterTest.java
+++ b/assembly/src/test/org/activemq/transport/TopicClusterTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
diff --git a/assembly/src/test/org/activemq/usecases/ChangeSentMessageTest.java b/assembly/src/test/org/activemq/usecases/ChangeSentMessageTest.java
index 5a5ca38c9b..31a76811ae 100755
--- a/assembly/src/test/org/activemq/usecases/ChangeSentMessageTest.java
+++ b/assembly/src/test/org/activemq/usecases/ChangeSentMessageTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
import java.util.HashMap;
diff --git a/assembly/src/test/org/activemq/usecases/ChangeSessionDeliveryModeTest.java b/assembly/src/test/org/activemq/usecases/ChangeSessionDeliveryModeTest.java
index 24625592f0..3114869271 100755
--- a/assembly/src/test/org/activemq/usecases/ChangeSessionDeliveryModeTest.java
+++ b/assembly/src/test/org/activemq/usecases/ChangeSessionDeliveryModeTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
import java.util.HashMap;
diff --git a/assembly/src/test/org/activemq/usecases/CompositeConsumeTest.java b/assembly/src/test/org/activemq/usecases/CompositeConsumeTest.java
index e29b989155..3babfde632 100755
--- a/assembly/src/test/org/activemq/usecases/CompositeConsumeTest.java
+++ b/assembly/src/test/org/activemq/usecases/CompositeConsumeTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
import org.activemq.command.ActiveMQTopic;
diff --git a/assembly/src/test/org/activemq/usecases/CompositePublishTest.java b/assembly/src/test/org/activemq/usecases/CompositePublishTest.java
index 23bc4c6177..87eec9baa1 100755
--- a/assembly/src/test/org/activemq/usecases/CompositePublishTest.java
+++ b/assembly/src/test/org/activemq/usecases/CompositePublishTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
import org.activemq.ActiveMQConnectionFactory;
diff --git a/assembly/src/test/org/activemq/usecases/ConsumeQueuePrefetchTest.java b/assembly/src/test/org/activemq/usecases/ConsumeQueuePrefetchTest.java
index 700a10c501..c48fa1e6db 100755
--- a/assembly/src/test/org/activemq/usecases/ConsumeQueuePrefetchTest.java
+++ b/assembly/src/test/org/activemq/usecases/ConsumeQueuePrefetchTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
import javax.jms.JMSException;
diff --git a/assembly/src/test/org/activemq/usecases/ConsumeTopicPrefetchTest.java b/assembly/src/test/org/activemq/usecases/ConsumeTopicPrefetchTest.java
index ad4f57ffd3..35e191adbb 100755
--- a/assembly/src/test/org/activemq/usecases/ConsumeTopicPrefetchTest.java
+++ b/assembly/src/test/org/activemq/usecases/ConsumeTopicPrefetchTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
import javax.jms.Connection;
diff --git a/assembly/src/test/org/activemq/usecases/CreateLotsOfTemporaryQueuesTest.java b/assembly/src/test/org/activemq/usecases/CreateLotsOfTemporaryQueuesTest.java
index 249830a7f9..e357ecfab5 100644
--- a/assembly/src/test/org/activemq/usecases/CreateLotsOfTemporaryQueuesTest.java
+++ b/assembly/src/test/org/activemq/usecases/CreateLotsOfTemporaryQueuesTest.java
@@ -1,20 +1,19 @@
/**
- *
- * 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
- *
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
import org.activemq.EmbeddedBrokerTestSupport;
diff --git a/assembly/src/test/org/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java b/assembly/src/test/org/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java
index 1dacd8700c..8ee269732b 100755
--- a/assembly/src/test/org/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java
+++ b/assembly/src/test/org/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
diff --git a/assembly/src/test/org/activemq/usecases/DeadLetterTest.java b/assembly/src/test/org/activemq/usecases/DeadLetterTest.java
index b154720a7b..97d5585f6e 100755
--- a/assembly/src/test/org/activemq/usecases/DeadLetterTest.java
+++ b/assembly/src/test/org/activemq/usecases/DeadLetterTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
import org.activemq.TestSupport;
diff --git a/assembly/src/test/org/activemq/usecases/DurableConsumerCloseAndReconnectTest.java b/assembly/src/test/org/activemq/usecases/DurableConsumerCloseAndReconnectTest.java
index 012b3626d0..95628b54ed 100755
--- a/assembly/src/test/org/activemq/usecases/DurableConsumerCloseAndReconnectTest.java
+++ b/assembly/src/test/org/activemq/usecases/DurableConsumerCloseAndReconnectTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
import org.activemq.test.TestSupport;
diff --git a/assembly/src/test/org/activemq/usecases/DurableSubscriptionTestSupport.java b/assembly/src/test/org/activemq/usecases/DurableSubscriptionTestSupport.java
index 1f6a82007b..cf05b6b0a0 100755
--- a/assembly/src/test/org/activemq/usecases/DurableSubscriptionTestSupport.java
+++ b/assembly/src/test/org/activemq/usecases/DurableSubscriptionTestSupport.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
import javax.jms.Connection;
diff --git a/assembly/src/test/org/activemq/usecases/JDBCDurableSubscriptionTest.java b/assembly/src/test/org/activemq/usecases/JDBCDurableSubscriptionTest.java
index 495598aa19..d78ba1a92b 100755
--- a/assembly/src/test/org/activemq/usecases/JDBCDurableSubscriptionTest.java
+++ b/assembly/src/test/org/activemq/usecases/JDBCDurableSubscriptionTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
+ * 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.usecases;
import java.io.File;
diff --git a/assembly/src/test/org/activemq/usecases/ProducerConsumerTestSupport.java b/assembly/src/test/org/activemq/usecases/ProducerConsumerTestSupport.java
index edf6cb8e1c..0d9e659ea4 100755
--- a/assembly/src/test/org/activemq/usecases/ProducerConsumerTestSupport.java
+++ b/assembly/src/test/org/activemq/usecases/ProducerConsumerTestSupport.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
import javax.jms.Connection;
diff --git a/assembly/src/test/org/activemq/usecases/PublishOnDurableTopicConsumedMessageTest.java b/assembly/src/test/org/activemq/usecases/PublishOnDurableTopicConsumedMessageTest.java
index 98f3b43e99..34b26b3410 100755
--- a/assembly/src/test/org/activemq/usecases/PublishOnDurableTopicConsumedMessageTest.java
+++ b/assembly/src/test/org/activemq/usecases/PublishOnDurableTopicConsumedMessageTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
/**
diff --git a/assembly/src/test/org/activemq/usecases/PublishOnQueueConsumedMessageTest.java b/assembly/src/test/org/activemq/usecases/PublishOnQueueConsumedMessageTest.java
index fbb16577bb..26d677761e 100755
--- a/assembly/src/test/org/activemq/usecases/PublishOnQueueConsumedMessageTest.java
+++ b/assembly/src/test/org/activemq/usecases/PublishOnQueueConsumedMessageTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
/**
diff --git a/assembly/src/test/org/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java b/assembly/src/test/org/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java
index 23a8d98b6a..fb13da1874 100644
--- a/assembly/src/test/org/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java
+++ b/assembly/src/test/org/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.usecases;
import org.activemq.broker.BrokerService;
diff --git a/assembly/src/test/org/activemq/usecases/PublishOnTemporaryQueueConsumedMessageTest.java b/assembly/src/test/org/activemq/usecases/PublishOnTemporaryQueueConsumedMessageTest.java
index 99a2205422..eac6f19f7e 100755
--- a/assembly/src/test/org/activemq/usecases/PublishOnTemporaryQueueConsumedMessageTest.java
+++ b/assembly/src/test/org/activemq/usecases/PublishOnTemporaryQueueConsumedMessageTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
import javax.jms.DeliveryMode;
diff --git a/assembly/src/test/org/activemq/usecases/PublishOnTopicConsumedMessageTest.java b/assembly/src/test/org/activemq/usecases/PublishOnTopicConsumedMessageTest.java
index f82e1d3ba1..abf301357d 100755
--- a/assembly/src/test/org/activemq/usecases/PublishOnTopicConsumedMessageTest.java
+++ b/assembly/src/test/org/activemq/usecases/PublishOnTopicConsumedMessageTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
import org.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
diff --git a/assembly/src/test/org/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java b/assembly/src/test/org/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java
index 859e0800b9..8fec5e66ab 100644
--- a/assembly/src/test/org/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java
+++ b/assembly/src/test/org/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java
@@ -1,21 +1,19 @@
/**
-* ActiveMQ: The Open Source Message Fabric
-*
-* Copyright 2005 (C) 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
-*
-* 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.
-*
-**/
+ *
+ * Copyright 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.
+ */
package org.activemq.usecases;
import org.activemq.broker.BrokerService;
diff --git a/assembly/src/test/org/activemq/usecases/QueueConsumerCloseAndReconnectTest.java b/assembly/src/test/org/activemq/usecases/QueueConsumerCloseAndReconnectTest.java
index 976d9ad3b0..f72be9c606 100755
--- a/assembly/src/test/org/activemq/usecases/QueueConsumerCloseAndReconnectTest.java
+++ b/assembly/src/test/org/activemq/usecases/QueueConsumerCloseAndReconnectTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
/**
diff --git a/assembly/src/test/org/activemq/usecases/QueueDuplicatesTest.java b/assembly/src/test/org/activemq/usecases/QueueDuplicatesTest.java
index 2431d4be55..870f1b1903 100755
--- a/assembly/src/test/org/activemq/usecases/QueueDuplicatesTest.java
+++ b/assembly/src/test/org/activemq/usecases/QueueDuplicatesTest.java
@@ -1,10 +1,18 @@
/**
- * 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
- * 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.
+ *
+ * Copyright 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.
*/
package org.activemq.usecases;
diff --git a/assembly/src/test/org/activemq/usecases/QueueRedeliverTest.java b/assembly/src/test/org/activemq/usecases/QueueRedeliverTest.java
index 467cbbd4f2..8c6425218a 100755
--- a/assembly/src/test/org/activemq/usecases/QueueRedeliverTest.java
+++ b/assembly/src/test/org/activemq/usecases/QueueRedeliverTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
diff --git a/assembly/src/test/org/activemq/usecases/ReliableReconnectTest.java b/assembly/src/test/org/activemq/usecases/ReliableReconnectTest.java
index ca77b70c7c..2d209b00b9 100755
--- a/assembly/src/test/org/activemq/usecases/ReliableReconnectTest.java
+++ b/assembly/src/test/org/activemq/usecases/ReliableReconnectTest.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Protique Ltd
+ * Copyright 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.
@@ -13,9 +13,7 @@
* 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.usecases;
import java.util.HashMap;
import java.net.URI;
diff --git a/assembly/src/test/org/activemq/usecases/StartAndStopBrokerTest.java b/assembly/src/test/org/activemq/usecases/StartAndStopBrokerTest.java
index 3edbd89bae..69044073cc 100755
--- a/assembly/src/test/org/activemq/usecases/StartAndStopBrokerTest.java
+++ b/assembly/src/test/org/activemq/usecases/StartAndStopBrokerTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
import junit.framework.TestCase;
diff --git a/assembly/src/test/org/activemq/usecases/SubscribeClosePublishThenConsumeTest.java b/assembly/src/test/org/activemq/usecases/SubscribeClosePublishThenConsumeTest.java
index 58f8c4532f..6cbd177746 100755
--- a/assembly/src/test/org/activemq/usecases/SubscribeClosePublishThenConsumeTest.java
+++ b/assembly/src/test/org/activemq/usecases/SubscribeClosePublishThenConsumeTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
import org.activemq.ActiveMQConnectionFactory;
diff --git a/assembly/src/test/org/activemq/usecases/TestSupport.java b/assembly/src/test/org/activemq/usecases/TestSupport.java
index 763eb5318e..79f17ce3ed 100755
--- a/assembly/src/test/org/activemq/usecases/TestSupport.java
+++ b/assembly/src/test/org/activemq/usecases/TestSupport.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
import org.activemq.ActiveMQConnectionFactory;
diff --git a/assembly/src/test/org/activemq/usecases/TopicRedeliverTest.java b/assembly/src/test/org/activemq/usecases/TopicRedeliverTest.java
index 5853df2d24..7fbd6b2dae 100755
--- a/assembly/src/test/org/activemq/usecases/TopicRedeliverTest.java
+++ b/assembly/src/test/org/activemq/usecases/TopicRedeliverTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
import javax.jms.Connection;
diff --git a/assembly/src/test/org/activemq/usecases/TransactionRollbackOrderTest.java b/assembly/src/test/org/activemq/usecases/TransactionRollbackOrderTest.java
index 14eb98485e..ac16216aa1 100644
--- a/assembly/src/test/org/activemq/usecases/TransactionRollbackOrderTest.java
+++ b/assembly/src/test/org/activemq/usecases/TransactionRollbackOrderTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
diff --git a/assembly/src/test/org/activemq/usecases/TransactionTest.java b/assembly/src/test/org/activemq/usecases/TransactionTest.java
index e9157320db..af770e35b2 100755
--- a/assembly/src/test/org/activemq/usecases/TransactionTest.java
+++ b/assembly/src/test/org/activemq/usecases/TransactionTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
import junit.framework.TestCase;
diff --git a/assembly/src/test/org/activemq/usecases/TransientQueueRedeliverTest.java b/assembly/src/test/org/activemq/usecases/TransientQueueRedeliverTest.java
index f9f6126235..070e00034b 100755
--- a/assembly/src/test/org/activemq/usecases/TransientQueueRedeliverTest.java
+++ b/assembly/src/test/org/activemq/usecases/TransientQueueRedeliverTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
import javax.jms.DeliveryMode;
diff --git a/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveTest.java b/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveTest.java
index 76c899af6d..cfee1b9402 100644
--- a/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveTest.java
+++ b/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
import javax.jms.Connection;
diff --git a/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingHttpTest.java b/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingHttpTest.java
index 4debedb48d..b0f2052dc7 100644
--- a/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingHttpTest.java
+++ b/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingHttpTest.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Protique Ltd
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.usecases;
import org.activemq.ActiveMQConnectionFactory;
diff --git a/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java b/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java
index 0022d5e3b6..4809d06c7f 100644
--- a/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java
+++ b/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
import org.activemq.ActiveMQConnectionFactory;
diff --git a/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java b/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java
index c48b96880e..8e2575bb83 100644
--- a/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java
+++ b/assembly/src/test/org/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.usecases;
import javax.jms.JMSException;
diff --git a/assembly/src/test/org/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java b/assembly/src/test/org/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java
index ae3bd7811f..261b029645 100644
--- a/assembly/src/test/org/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java
+++ b/assembly/src/test/org/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Protique Ltd
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.usecases;
import org.activemq.ActiveMQConnectionFactory;
diff --git a/jmeter/src/java/org/activemq/sampler/Consumer.java b/jmeter/src/java/org/activemq/sampler/Consumer.java
index 9037fe07d9..1f767d0b40 100755
--- a/jmeter/src/java/org/activemq/sampler/Consumer.java
+++ b/jmeter/src/java/org/activemq/sampler/Consumer.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Protique Ltd
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.sampler;
import org.activemq.util.IdGenerator;
diff --git a/jmeter/src/java/org/activemq/sampler/ConsumerSysTest.java b/jmeter/src/java/org/activemq/sampler/ConsumerSysTest.java
index e9eaebb763..60f8f78d1d 100644
--- a/jmeter/src/java/org/activemq/sampler/ConsumerSysTest.java
+++ b/jmeter/src/java/org/activemq/sampler/ConsumerSysTest.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activemq.sampler;
import org.apache.log.Logger;
diff --git a/jmeter/src/java/org/activemq/sampler/Producer.java b/jmeter/src/java/org/activemq/sampler/Producer.java
index 44423fca18..28204997b2 100755
--- a/jmeter/src/java/org/activemq/sampler/Producer.java
+++ b/jmeter/src/java/org/activemq/sampler/Producer.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Protique Ltd
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.sampler;
import org.apache.jmeter.engine.event.LoopIterationEvent;
diff --git a/jmeter/src/java/org/activemq/sampler/ProducerSysTest.java b/jmeter/src/java/org/activemq/sampler/ProducerSysTest.java
index 449e917ea1..acb42ba963 100644
--- a/jmeter/src/java/org/activemq/sampler/ProducerSysTest.java
+++ b/jmeter/src/java/org/activemq/sampler/ProducerSysTest.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 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.
+ */
package org.activemq.sampler;
import org.apache.jmeter.testelement.TestListener;
diff --git a/jmeter/src/java/org/activemq/sampler/Sampler.java b/jmeter/src/java/org/activemq/sampler/Sampler.java
index f8b91bb8ce..69f4e15de7 100755
--- a/jmeter/src/java/org/activemq/sampler/Sampler.java
+++ b/jmeter/src/java/org/activemq/sampler/Sampler.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Protique Ltd
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.sampler;
diff --git a/jmeter/src/java/org/activemq/sampler/SamplerClient.java b/jmeter/src/java/org/activemq/sampler/SamplerClient.java
index 572ad646e5..00bb0d8940 100755
--- a/jmeter/src/java/org/activemq/sampler/SamplerClient.java
+++ b/jmeter/src/java/org/activemq/sampler/SamplerClient.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Protique Ltd
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.sampler;
import java.io.InputStream;
diff --git a/jmeter/src/java/org/activemq/sampler/SamplerClientImpl.java b/jmeter/src/java/org/activemq/sampler/SamplerClientImpl.java
index 9842ece030..1ad3acebb2 100755
--- a/jmeter/src/java/org/activemq/sampler/SamplerClientImpl.java
+++ b/jmeter/src/java/org/activemq/sampler/SamplerClientImpl.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Protique Ltd
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.sampler;
import java.io.ByteArrayOutputStream;
diff --git a/jmeter/src/java/org/activemq/sampler/config/SamplerConfig.java b/jmeter/src/java/org/activemq/sampler/config/SamplerConfig.java
index c13b004855..7df00e1935 100755
--- a/jmeter/src/java/org/activemq/sampler/config/SamplerConfig.java
+++ b/jmeter/src/java/org/activemq/sampler/config/SamplerConfig.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Protique Ltd
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.sampler.config;
diff --git a/jmeter/src/java/org/activemq/sampler/config/gui/ConsumerConfigGui.java b/jmeter/src/java/org/activemq/sampler/config/gui/ConsumerConfigGui.java
index a6d56bad57..7ec7fa3df2 100755
--- a/jmeter/src/java/org/activemq/sampler/config/gui/ConsumerConfigGui.java
+++ b/jmeter/src/java/org/activemq/sampler/config/gui/ConsumerConfigGui.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Protique Ltd
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.sampler.config.gui;
import org.apache.jmeter.config.ConfigTestElement;
diff --git a/jmeter/src/java/org/activemq/sampler/config/gui/ConsumerSysTestConfigGui.java b/jmeter/src/java/org/activemq/sampler/config/gui/ConsumerSysTestConfigGui.java
index 6602b3be7d..1b4ab28252 100644
--- a/jmeter/src/java/org/activemq/sampler/config/gui/ConsumerSysTestConfigGui.java
+++ b/jmeter/src/java/org/activemq/sampler/config/gui/ConsumerSysTestConfigGui.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Protique Ltd
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.sampler.config.gui;
import org.apache.jmeter.config.ConfigTestElement;
diff --git a/jmeter/src/java/org/activemq/sampler/config/gui/ProducerConfigGui.java b/jmeter/src/java/org/activemq/sampler/config/gui/ProducerConfigGui.java
index 388ea49665..1a99b325b0 100755
--- a/jmeter/src/java/org/activemq/sampler/config/gui/ProducerConfigGui.java
+++ b/jmeter/src/java/org/activemq/sampler/config/gui/ProducerConfigGui.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Protique Ltd
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.sampler.config.gui;
import org.apache.jmeter.config.ConfigTestElement;
diff --git a/jmeter/src/java/org/activemq/sampler/config/gui/ProducerSysTestConfigGui.java b/jmeter/src/java/org/activemq/sampler/config/gui/ProducerSysTestConfigGui.java
index ff31572b5c..4f005b0505 100644
--- a/jmeter/src/java/org/activemq/sampler/config/gui/ProducerSysTestConfigGui.java
+++ b/jmeter/src/java/org/activemq/sampler/config/gui/ProducerSysTestConfigGui.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Protique Ltd
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.sampler.config.gui;
import org.apache.jmeter.config.ConfigTestElement;
diff --git a/jmeter/src/java/org/activemq/sampler/control/gui/ConsumerSamplerGui.java b/jmeter/src/java/org/activemq/sampler/control/gui/ConsumerSamplerGui.java
index 9191323f45..b791bce64a 100755
--- a/jmeter/src/java/org/activemq/sampler/control/gui/ConsumerSamplerGui.java
+++ b/jmeter/src/java/org/activemq/sampler/control/gui/ConsumerSamplerGui.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Protique Ltd
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.sampler.control.gui;
import org.apache.jmeter.gui.util.VerticalPanel;
diff --git a/jmeter/src/java/org/activemq/sampler/control/gui/ConsumerSysTestSamplerGui.java b/jmeter/src/java/org/activemq/sampler/control/gui/ConsumerSysTestSamplerGui.java
index 6c6a995672..9d4ed93c06 100644
--- a/jmeter/src/java/org/activemq/sampler/control/gui/ConsumerSysTestSamplerGui.java
+++ b/jmeter/src/java/org/activemq/sampler/control/gui/ConsumerSysTestSamplerGui.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Protique Ltd
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.sampler.control.gui;
import org.apache.jmeter.gui.util.VerticalPanel;
diff --git a/jmeter/src/java/org/activemq/sampler/control/gui/ProducerSamplerGui.java b/jmeter/src/java/org/activemq/sampler/control/gui/ProducerSamplerGui.java
index 35860f8aee..5ebfb3e3c1 100755
--- a/jmeter/src/java/org/activemq/sampler/control/gui/ProducerSamplerGui.java
+++ b/jmeter/src/java/org/activemq/sampler/control/gui/ProducerSamplerGui.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Protique Ltd
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.sampler.control.gui;
import org.apache.jmeter.config.gui.LoginConfigGui;
diff --git a/jmeter/src/java/org/activemq/sampler/control/gui/ProducerSysTestSamplerGui.java b/jmeter/src/java/org/activemq/sampler/control/gui/ProducerSysTestSamplerGui.java
index 78ade41371..00ecad6dfa 100644
--- a/jmeter/src/java/org/activemq/sampler/control/gui/ProducerSysTestSamplerGui.java
+++ b/jmeter/src/java/org/activemq/sampler/control/gui/ProducerSysTestSamplerGui.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Protique Ltd
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.sampler.control.gui;
import org.apache.jmeter.config.gui.LoginConfigGui;
diff --git a/jmeter/src/java/org/activemq/util/ant/MergePropertiesTask.java b/jmeter/src/java/org/activemq/util/ant/MergePropertiesTask.java
index a9922894ea..bb21c327a3 100755
--- a/jmeter/src/java/org/activemq/util/ant/MergePropertiesTask.java
+++ b/jmeter/src/java/org/activemq/util/ant/MergePropertiesTask.java
@@ -1,20 +1,19 @@
-/**
- *
- * 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
- *
+/**
+ *
+ * Copyright 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.
- *
- **/
+ * 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.util.ant;
diff --git a/jmeter/src/java/org/activemq/util/connection/ServerConnectionFactory.java b/jmeter/src/java/org/activemq/util/connection/ServerConnectionFactory.java
index 32c13bd796..53b13d6020 100755
--- a/jmeter/src/java/org/activemq/util/connection/ServerConnectionFactory.java
+++ b/jmeter/src/java/org/activemq/util/connection/ServerConnectionFactory.java
@@ -1,6 +1,6 @@
/**
*
- * Copyright 2004 Protique Ltd
+ * Copyright 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.
@@ -13,8 +13,7 @@
* 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.util.connection;
import org.activemq.ActiveMQConnectionFactory;