Author: gnodet
Date: Fri Sep 29 04:36:54 2006
New Revision: 451249
URL: http://svn.apache.org/viewvc?view=rev&rev=451249
Log:
SM-611: Reduce non-optional core dependencies
Added:
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/CountStatisticImpl.java
- copied, changed from r415613,
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/CountStatisticImpl.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/Resettable.java
- copied, changed from r415613,
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/Resettable.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/StatisticImpl.java
- copied, changed from r415613,
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/StatisticImpl.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/StatsImpl.java
- copied, changed from r415613,
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/StatsImpl.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/TimeStatisticImpl.java
- copied, changed from r415613,
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/TimeStatisticImpl.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/FactoryFinder.java
- copied, changed from r415613,
incubator/activemq/trunk/activeio/activeio-core/src/main/java/org/apache/activeio/util/FactoryFinder.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/IndentPrinter.java
- copied, changed from r415613,
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IndentPrinter.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/IntrospectionSupport.java
- copied, changed from r415613,
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IntrospectionSupport.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/URISupport.java
- copied, changed from r415613,
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/URISupport.java
Modified:
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessagingStats.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/FlowProvider.java
Copied:
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/CountStatisticImpl.java
(from r415613,
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/CountStatisticImpl.java)
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/CountStatisticImpl.java?view=diff&rev=451249&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/CountStatisticImpl.java&r1=415613&p2=incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/CountStatisticImpl.java&r2=451249
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/CountStatisticImpl.java
(original)
+++
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/CountStatisticImpl.java
Fri Sep 29 04:36:54 2006
@@ -1,12 +1,12 @@
-/**
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.management;
+package org.apache.servicemix.jbi.management.stats;
import javax.management.j2ee.statistics.CountStatistic;
Copied:
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/Resettable.java
(from r415613,
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/Resettable.java)
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/Resettable.java?view=diff&rev=451249&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/Resettable.java&r1=415613&p2=incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/Resettable.java&r2=451249
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/Resettable.java
(original)
+++
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/Resettable.java
Fri Sep 29 04:36:54 2006
@@ -1,12 +1,12 @@
-/**
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.management;
+package org.apache.servicemix.jbi.management.stats;
/**
* Represents some statistic that is capable of being reset
Copied:
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/StatisticImpl.java
(from r415613,
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/StatisticImpl.java)
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/StatisticImpl.java?view=diff&rev=451249&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/StatisticImpl.java&r1=415613&p2=incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/StatisticImpl.java&r2=451249
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/StatisticImpl.java
(original)
+++
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/StatisticImpl.java
Fri Sep 29 04:36:54 2006
@@ -1,12 +1,12 @@
-/**
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,9 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.management;
+package org.apache.servicemix.jbi.management.stats;
import javax.management.j2ee.statistics.Statistic;
+
/**
* Base class for a Statistic implementation
*
Copied:
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/StatsImpl.java
(from r415613,
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/StatsImpl.java)
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/StatsImpl.java?view=diff&rev=451249&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/StatsImpl.java&r1=415613&p2=incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/StatsImpl.java&r2=451249
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/StatsImpl.java
(original)
+++
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/StatsImpl.java
Fri Sep 29 04:36:54 2006
@@ -1,12 +1,12 @@
-/**
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,12 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.management;
+package org.apache.servicemix.jbi.management.stats;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
-import java.util.*;
import javax.management.j2ee.statistics.Statistic;
import javax.management.j2ee.statistics.Stats;
-
/**
* Base class for a Stats implementation
Copied:
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/TimeStatisticImpl.java
(from r415613,
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/TimeStatisticImpl.java)
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/TimeStatisticImpl.java?view=diff&rev=451249&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/TimeStatisticImpl.java&r1=415613&p2=incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/TimeStatisticImpl.java&r2=451249
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/TimeStatisticImpl.java
(original)
+++
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/stats/TimeStatisticImpl.java
Fri Sep 29 04:36:54 2006
@@ -1,12 +1,12 @@
-/**
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,8 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.management;
-
+package org.apache.servicemix.jbi.management.stats;
/**
* A time statistic implementation
Modified:
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessagingStats.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessagingStats.java?view=diff&rev=451249&r1=451248&r2=451249
==============================================================================
---
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessagingStats.java
(original)
+++
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessagingStats.java
Fri Sep 29 04:36:54 2006
@@ -16,10 +16,11 @@
*/
package org.apache.servicemix.jbi.messaging;
-import org.apache.activemq.management.CountStatisticImpl;
-import org.apache.activemq.management.StatsImpl;
-import org.apache.activemq.management.TimeStatisticImpl;
-import org.apache.activemq.util.IndentPrinter;
+import org.apache.servicemix.jbi.management.stats.CountStatisticImpl;
+import org.apache.servicemix.jbi.management.stats.StatsImpl;
+import org.apache.servicemix.jbi.management.stats.TimeStatisticImpl;
+import org.apache.servicemix.jbi.util.IndentPrinter;
+
/**
* Basic J2EE stats for the messaging in the NMR
Modified:
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/FlowProvider.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/FlowProvider.java?view=diff&rev=451249&r1=451248&r2=451249
==============================================================================
---
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/FlowProvider.java
(original)
+++
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/FlowProvider.java
Fri Sep 29 04:36:54 2006
@@ -20,9 +20,9 @@
import java.net.URISyntaxException;
import java.util.Map;
import javax.jbi.JBIException;
-import org.apache.activeio.util.FactoryFinder;
-import org.apache.activemq.util.IntrospectionSupport;
-import org.apache.activemq.util.URISupport;
+import org.apache.servicemix.jbi.util.FactoryFinder;
+import org.apache.servicemix.jbi.util.IntrospectionSupport;
+import org.apache.servicemix.jbi.util.URISupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Copied:
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/FactoryFinder.java
(from r415613,
incubator/activemq/trunk/activeio/activeio-core/src/main/java/org/apache/activeio/util/FactoryFinder.java)
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/FactoryFinder.java?view=diff&rev=451249&p1=incubator/activemq/trunk/activeio/activeio-core/src/main/java/org/apache/activeio/util/FactoryFinder.java&r1=415613&p2=incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/FactoryFinder.java&r2=451249
==============================================================================
---
incubator/activemq/trunk/activeio/activeio-core/src/main/java/org/apache/activeio/util/FactoryFinder.java
(original)
+++
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/FactoryFinder.java
Fri Sep 29 04:36:54 2006
@@ -1,12 +1,12 @@
-/**
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activeio.util;
+package org.apache.servicemix.jbi.util;
import java.io.BufferedInputStream;
import java.io.IOException;
Copied:
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/IndentPrinter.java
(from r415613,
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IndentPrinter.java)
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/IndentPrinter.java?view=diff&rev=451249&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IndentPrinter.java&r1=415613&p2=incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/IndentPrinter.java&r2=451249
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IndentPrinter.java
(original)
+++
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/IndentPrinter.java
Fri Sep 29 04:36:54 2006
@@ -1,12 +1,12 @@
-/**
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.util;
+package org.apache.servicemix.jbi.util;
import java.io.PrintWriter;
Copied:
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/IntrospectionSupport.java
(from r415613,
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IntrospectionSupport.java)
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/IntrospectionSupport.java?view=diff&rev=451249&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IntrospectionSupport.java&r1=415613&p2=incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/IntrospectionSupport.java&r2=451249
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IntrospectionSupport.java
(original)
+++
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/IntrospectionSupport.java
Fri Sep 29 04:36:54 2006
@@ -1,12 +1,12 @@
-/**
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,9 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.util;
-
-import org.apache.activemq.command.ActiveMQDestination;
+package org.apache.servicemix.jbi.util;
import java.beans.PropertyEditor;
import java.beans.PropertyEditorManager;
@@ -166,20 +164,10 @@
}
buffer.append(entry.getKey());
buffer.append(" = ");
- appendToString(buffer, entry.getValue());
+ buffer.append(entry.getValue());
}
buffer.append("}");
return buffer.toString();
- }
-
- protected static void appendToString(StringBuffer buffer, Object value) {
- if (value instanceof ActiveMQDestination) {
- ActiveMQDestination destination = (ActiveMQDestination) value;
- buffer.append(destination.getQualifiedName());
- }
- else {
- buffer.append(value);
- }
}
static public String simpleName(Class clazz) {
Copied:
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/URISupport.java
(from r415613,
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/URISupport.java)
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/URISupport.java?view=diff&rev=451249&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/URISupport.java&r1=415613&p2=incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/URISupport.java&r2=451249
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/URISupport.java
(original)
+++
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/URISupport.java
Fri Sep 29 04:36:54 2006
@@ -1,12 +1,12 @@
-/**
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.util;
+package org.apache.servicemix.jbi.util;
import java.io.UnsupportedEncodingException;
import java.net.URI;
