From 68fb9a03641e50fbb6c045ac2f39091bf0bf9d08 Mon Sep 17 00:00:00 2001 From: Rajith Muditha Attapattu Date: Fri, 12 Feb 2010 22:30:38 +0000 Subject: I have added the license header to the files included in this commit. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@909641 13f79535-47bb-0310-9956-ffa450edef68 --- java/broker/scripts/resetAlerting.sh | 21 + .../server/protocol/AMQProtocolEngineFactory.java | 21 + .../apache/qpid/server/queue/SubFlushRunner.java | 21 + .../security/access/AuthorizationManager.java | 21 + .../apache/qpid/server/txn/LocalTransaction.java | 21 + .../qpid/client/message/AMQPEncodedMapMessage.java | 21 + .../message/AMQPEncodedMapMessageFactory.java | 21 + .../client/message/AbstractJMSMessageTest.java | 21 + .../org/apache/qpid/configuration/Accessor.java | 23 +- .../org/apache/qpid/configuration/Validator.java | 21 + .../apache/qpid/thread/DefaultThreadFactory.java | 21 + .../apache/qpid/thread/RealtimeThreadFactory.java | 21 + .../java/org/apache/qpid/thread/ThreadFactory.java | 21 + .../java/org/apache/qpid/thread/Threading.java | 21 + .../network/security/sasl/SASLEncryptor.java | 21 + .../network/security/sasl/SASLReceiver.java | 21 + .../network/security/sasl/SASLSender.java | 21 + .../java/org/apache/qpid/codec/AMQDecoderTest.java | 21 + .../codec/MockAMQVersionAwareProtocolSession.java | 21 + .../org/apache/qpid/thread/ThreadFactoryTest.java | 21 + java/etc/code-style.xml | 23 +- .../java/org/apache/qpid/agent/EventSeverity.java | 21 + .../client/console/brokers_management.jsp | 397 +++--- java/management/client/console/console.jsp | 223 ++-- java/management/client/console/error_page.jsp | 97 +- .../management/client/console/fragments/header.jsp | 51 +- java/management/client/console/fragments/menu.jsp | 41 +- java/management/client/console/images/style.css | 383 +++--- java/management/client/console/jmx_perspective.jsp | 293 +++-- .../client/console/logging_configuration.jsp | 461 +++---- .../client/console/resources_management.jsp | 189 +-- java/management/client/console/tbd.jsp | 75 +- .../client/console/wsdm_operations_perspective.jsp | 327 ++--- .../client/console/wsdm_properties_perspective.jsp | 415 +++--- .../client/console/wsdm_rmd_perspective.jsp | 177 +-- .../client/console/wsdm_wsdl_perspective.jsp | 177 +-- java/management/client/etc/jetty.xml | 23 +- java/management/client/etc/log4j.xml | 33 +- java/management/client/src/main/java/muse.xml | 397 +++--- .../qpid/management/domain/model/QpidEntity.java | 347 ++--- .../wsdm/muse/engine/WSDMAdapterEnvironment.java | 215 ++-- .../muse/engine/WSDMAdapterIsolationLayer.java | 93 +- .../router-entries/adapter/resource-instance-1.xml | 21 + .../consumer/resource-instance-1.xml | 25 +- .../src/main/java/wsdl/SOAP-Envelope-1_2.xsd | 341 ++--- .../src/main/java/wsdl/WS-Addressing-2005_08.xsd | 61 +- .../main/java/wsdl/WS-MetadataExchange-2004_09.xsd | 247 ++-- .../src/main/java/wsdl/WSDM-MUWS-Part1-1_1.xsd | 207 +-- .../src/main/java/wsdl/WSDM-MUWS-Part2-1_1.xsd | 1333 ++++++++++---------- .../src/main/java/wsdl/XML-Namespace-1998.xsd | 71 +- java/management/client/src/test/java/log4j.xml | 41 +- .../java/org/apache/qpid/management/wsdm/web.xml | 23 +- java/management/client/web.xml | 23 +- .../main/java/org/apache/qpid/console/XMLUtil.java | 21 + java/perftests/bin/monitoring/monitor-broker.sh | 21 + java/perftests/bin/monitoring/runTests.sh | 21 + .../bin/monitoring/stop-monitored-broker.sh | 21 + java/perftests/bin/processing/process.sh | 21 + java/perftests/bin/processing/processAll.sh | 21 + java/perftests/etc/scripts/extractResults.sh | 21 + .../etc/scripts/extractThroughputResults.sh | 21 + ...config-systests-ServerConfigurationTest-Old.xml | 21 + .../client/message/AMQPEncodedMapMessageTest.java | 21 + .../security/firewall/FirewallConfigTest.java | 21 + .../destination/AddressBasedDestinationTest.java | 21 + .../java/org/apache/qpid/testkit/ErrorHandler.java | 21 + 66 files changed, 4466 insertions(+), 3080 deletions(-) (limited to 'java') diff --git a/java/broker/scripts/resetAlerting.sh b/java/broker/scripts/resetAlerting.sh index 57a38f3ed1..18e8c64cb0 100644 --- a/java/broker/scripts/resetAlerting.sh +++ b/java/broker/scripts/resetAlerting.sh @@ -1,4 +1,25 @@ #!/bin/bash +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# + # # Alerting Rest Scripts to renabled the alerts on the queue. # diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngineFactory.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngineFactory.java index ff0c007a60..0e4444725e 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngineFactory.java +++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngineFactory.java @@ -1,4 +1,25 @@ package org.apache.qpid.server.protocol; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import org.apache.qpid.protocol.ProtocolEngine; import org.apache.qpid.protocol.ProtocolEngineFactory; diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java b/java/broker/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java index 547365f647..1309e05978 100755 --- a/java/broker/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java +++ b/java/broker/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java @@ -1,4 +1,25 @@ package org.apache.qpid.server.queue; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import org.apache.qpid.pool.ReadWriteRunnable; import org.apache.qpid.server.subscription.Subscription; diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/AuthorizationManager.java b/java/broker/src/main/java/org/apache/qpid/server/security/access/AuthorizationManager.java index 9527120f30..895ed52222 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/security/access/AuthorizationManager.java +++ b/java/broker/src/main/java/org/apache/qpid/server/security/access/AuthorizationManager.java @@ -1,4 +1,25 @@ package org.apache.qpid.server.security.access; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + public class AuthorizationManager { diff --git a/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java b/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java index 1124b0e812..7c9276dbdc 100755 --- a/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java +++ b/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java @@ -1,4 +1,25 @@ package org.apache.qpid.server.txn; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.queue.QueueEntry; diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java b/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java index 2e9d932e40..f66387e734 100644 --- a/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java +++ b/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java @@ -1,4 +1,25 @@ package org.apache.qpid.client.message; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import java.util.Map; diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageFactory.java b/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageFactory.java index 37ade9cf80..4978d1ce85 100644 --- a/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageFactory.java +++ b/java/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageFactory.java @@ -1,4 +1,25 @@ package org.apache.qpid.client.message; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import javax.jms.JMSException; diff --git a/java/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java b/java/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java index b4774113be..f81f482c6a 100644 --- a/java/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java +++ b/java/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java @@ -1,4 +1,25 @@ package org.apache.qpid.client.message; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import javax.jms.JMSException; diff --git a/java/common/src/main/java/org/apache/qpid/configuration/Accessor.java b/java/common/src/main/java/org/apache/qpid/configuration/Accessor.java index 19011776d7..6cf73c5768 100644 --- a/java/common/src/main/java/org/apache/qpid/configuration/Accessor.java +++ b/java/common/src/main/java/org/apache/qpid/configuration/Accessor.java @@ -1,4 +1,25 @@ package org.apache.qpid.configuration; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -238,4 +259,4 @@ public interface Accessor return v; } } -} \ No newline at end of file +} diff --git a/java/common/src/main/java/org/apache/qpid/configuration/Validator.java b/java/common/src/main/java/org/apache/qpid/configuration/Validator.java index 6408f4523a..d3bb1606db 100644 --- a/java/common/src/main/java/org/apache/qpid/configuration/Validator.java +++ b/java/common/src/main/java/org/apache/qpid/configuration/Validator.java @@ -1,4 +1,25 @@ package org.apache.qpid.configuration; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + public interface Validator { diff --git a/java/common/src/main/java/org/apache/qpid/thread/DefaultThreadFactory.java b/java/common/src/main/java/org/apache/qpid/thread/DefaultThreadFactory.java index 70d7d2c6b2..9786d8fc3f 100644 --- a/java/common/src/main/java/org/apache/qpid/thread/DefaultThreadFactory.java +++ b/java/common/src/main/java/org/apache/qpid/thread/DefaultThreadFactory.java @@ -1,4 +1,25 @@ package org.apache.qpid.thread; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + public class DefaultThreadFactory implements ThreadFactory { diff --git a/java/common/src/main/java/org/apache/qpid/thread/RealtimeThreadFactory.java b/java/common/src/main/java/org/apache/qpid/thread/RealtimeThreadFactory.java index b711f749f8..0507b3108f 100644 --- a/java/common/src/main/java/org/apache/qpid/thread/RealtimeThreadFactory.java +++ b/java/common/src/main/java/org/apache/qpid/thread/RealtimeThreadFactory.java @@ -1,4 +1,25 @@ package org.apache.qpid.thread; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import java.lang.reflect.Constructor; diff --git a/java/common/src/main/java/org/apache/qpid/thread/ThreadFactory.java b/java/common/src/main/java/org/apache/qpid/thread/ThreadFactory.java index f9bcabfa3d..4b8937acbd 100644 --- a/java/common/src/main/java/org/apache/qpid/thread/ThreadFactory.java +++ b/java/common/src/main/java/org/apache/qpid/thread/ThreadFactory.java @@ -1,4 +1,25 @@ package org.apache.qpid.thread; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + public interface ThreadFactory { diff --git a/java/common/src/main/java/org/apache/qpid/thread/Threading.java b/java/common/src/main/java/org/apache/qpid/thread/Threading.java index 0fb113d22c..603e8a7441 100644 --- a/java/common/src/main/java/org/apache/qpid/thread/Threading.java +++ b/java/common/src/main/java/org/apache/qpid/thread/Threading.java @@ -1,4 +1,25 @@ package org.apache.qpid.thread; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + public final class Threading { diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java b/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java index 939483a280..7964239e31 100644 --- a/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java +++ b/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java @@ -1,4 +1,25 @@ package org.apache.qpid.transport.network.security.sasl; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import java.util.concurrent.atomic.AtomicBoolean; diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLReceiver.java b/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLReceiver.java index 2e6cce33fd..a9e8566d01 100644 --- a/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLReceiver.java +++ b/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLReceiver.java @@ -1,4 +1,25 @@ package org.apache.qpid.transport.network.security.sasl; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import java.nio.ByteBuffer; diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLSender.java b/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLSender.java index 4c50606c60..27255f79f6 100644 --- a/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLSender.java +++ b/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLSender.java @@ -1,4 +1,25 @@ package org.apache.qpid.transport.network.security.sasl; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/java/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java b/java/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java index 46c812e265..62e25e7d79 100644 --- a/java/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java +++ b/java/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java @@ -1,4 +1,25 @@ package org.apache.qpid.codec; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import java.nio.ByteBuffer; import java.util.ArrayList; diff --git a/java/common/src/test/java/org/apache/qpid/codec/MockAMQVersionAwareProtocolSession.java b/java/common/src/test/java/org/apache/qpid/codec/MockAMQVersionAwareProtocolSession.java index c3b91d5d18..401848c21d 100644 --- a/java/common/src/test/java/org/apache/qpid/codec/MockAMQVersionAwareProtocolSession.java +++ b/java/common/src/test/java/org/apache/qpid/codec/MockAMQVersionAwareProtocolSession.java @@ -1,4 +1,25 @@ package org.apache.qpid.codec; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import java.nio.ByteBuffer; diff --git a/java/common/src/test/java/org/apache/qpid/thread/ThreadFactoryTest.java b/java/common/src/test/java/org/apache/qpid/thread/ThreadFactoryTest.java index 9932633cb9..7f17592893 100644 --- a/java/common/src/test/java/org/apache/qpid/thread/ThreadFactoryTest.java +++ b/java/common/src/test/java/org/apache/qpid/thread/ThreadFactoryTest.java @@ -1,4 +1,25 @@ package org.apache.qpid.thread; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import junit.framework.TestCase; diff --git a/java/etc/code-style.xml b/java/etc/code-style.xml index a52b2a0c74..298275fd58 100644 --- a/java/etc/code-style.xml +++ b/java/etc/code-style.xml @@ -1,4 +1,25 @@ + + @@ -248,4 +269,4 @@ - \ No newline at end of file + diff --git a/java/management/agent/src/main/java/org/apache/qpid/agent/EventSeverity.java b/java/management/agent/src/main/java/org/apache/qpid/agent/EventSeverity.java index a3528d9804..28735286c4 100644 --- a/java/management/agent/src/main/java/org/apache/qpid/agent/EventSeverity.java +++ b/java/management/agent/src/main/java/org/apache/qpid/agent/EventSeverity.java @@ -1,4 +1,25 @@ package org.apache.qpid.agent; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + public enum EventSeverity { diff --git a/java/management/client/console/brokers_management.jsp b/java/management/client/console/brokers_management.jsp index 449eabfcc1..f307006ac1 100644 --- a/java/management/client/console/brokers_management.jsp +++ b/java/management/client/console/brokers_management.jsp @@ -1,188 +1,209 @@ -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> -<%@page import="org.apache.qpid.management.web.action.BrokerModel"%> -<%@page import="java.util.Set"%> -<%@page import="javax.management.ObjectName"%> -<%@page import="org.apache.qpid.management.Names"%> -<%@page import="java.util.List"%> -<%@page import="java.util.*"%> -<%@page import="java.net.URI"%> -<%@page import="javax.xml.namespace.QName"%> -<%@page import="org.w3c.dom.Element"%> - - - - QMan Administration Console - - -
- - - - -
- - -
-
- - - - - - - - - - - - - -
-
- Connected Brokers - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
HostPortVirtual HostUsernameInitial Pool CapacityMax Pool CapacityMax Wait Timeout
-
-
-
-
- New Broker Connection Data - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Host : - - - - The hostname where the broker is running. -
- Port : - - - - The port number where the broker is running. -
- Virtual Host : - - - - The virtual host name. -
- Username : - - - - The username used for estabilish connection with broker. -
- Password : - - - - The password used for estabilish connection with broker. -
- Initial Pool Capacity : - - - - The number of connections that must be immediately opened. -
- Max Pool Capacity : - - - - The maximum number of open connections. -
- Max Wait Timeout : - - - - The maximum amount of time that a client will wait for obtaining a connection. -
- -
-
-
-
    - -
  • ${errorMessage}
    • -     -
-
- -
-
-
-
- - \ No newline at end of file + + +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> +<%@page import="org.apache.qpid.management.web.action.BrokerModel"%> +<%@page import="java.util.Set"%> +<%@page import="javax.management.ObjectName"%> +<%@page import="org.apache.qpid.management.Names"%> +<%@page import="java.util.List"%> +<%@page import="java.util.*"%> +<%@page import="java.net.URI"%> +<%@page import="javax.xml.namespace.QName"%> +<%@page import="org.w3c.dom.Element"%> + + + + QMan Administration Console + + +
+ + + + +
+ + +
+
+ + + + + + + + + + + + + +
+
+ Connected Brokers + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
HostPortVirtual HostUsernameInitial Pool CapacityMax Pool CapacityMax Wait Timeout
+
+
+
+
+ New Broker Connection Data + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Host : + + + + The hostname where the broker is running. +
+ Port : + + + + The port number where the broker is running. +
+ Virtual Host : + + + + The virtual host name. +
+ Username : + + + + The username used for estabilish connection with broker. +
+ Password : + + + + The password used for estabilish connection with broker. +
+ Initial Pool Capacity : + + + + The number of connections that must be immediately opened. +
+ Max Pool Capacity : + + + + The maximum number of open connections. +
+ Max Wait Timeout : + + + + The maximum amount of time that a client will wait for obtaining a connection. +
+ +
+
+
+
    + +
  • ${errorMessage}
    • +     +
+
+ +
+
+
+
+ + diff --git a/java/management/client/console/console.jsp b/java/management/client/console/console.jsp index cdb53fede9..d1a207fe32 100644 --- a/java/management/client/console/console.jsp +++ b/java/management/client/console/console.jsp @@ -1,101 +1,122 @@ -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> - - - - QMan Administration Console - - -
- - - - -
- - -
-
- - - - - - -
-
- QMan - - - - - - - - - - - - - - - - - -
Version
${requestScope.model.version}

Version Name
${requestScope.model.versionName}

Start Date
- -

Host
${requestScope.model.host}

Port
${requestScope.model.port}
-
-
- Operating System - - - - - - - - - - - - -
Name
${requestScope.model.osName}

Version
${requestScope.model.osVersion}

Arch
${requestScope.model.archName}

Processors
${requestScope.model.processors}
-
- 		-
- JVM Environment - - - - - -
-

Boot Classpath : -

- - ; -
- -

- 		-

- Input Arguments : -

- - ; -
- -

-
-
-
- -
-
-
-
- - \ No newline at end of file + + +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> + + + + QMan Administration Console + + +
+ + + + +
+ + +
+
+ + + + + + +
+
+ QMan + + + + + + + + + + + + + + + + + +
Version
${requestScope.model.version}

Version Name
${requestScope.model.versionName}

Start Date
+ +

Host
${requestScope.model.host}

Port
${requestScope.model.port}
+
+
+ Operating System + + + + + + + + + + + + +
Name
${requestScope.model.osName}

Version
${requestScope.model.osVersion}

Arch
${requestScope.model.archName}

Processors
${requestScope.model.processors}
+
+ 		+
+ JVM Environment + + + + + +
+

Boot Classpath : +

+ + ; +
+ +

+ 		+

+ Input Arguments : +

+ + ; +
+ +

+
+
+
+ +
+
+
+
+ + diff --git a/java/management/client/console/error_page.jsp b/java/management/client/console/error_page.jsp index a0fd1e3629..73d2f9edc3 100644 --- a/java/management/client/console/error_page.jsp +++ b/java/management/client/console/error_page.jsp @@ -1,38 +1,59 @@ -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> - - - - QMan Administration Console - - -
- - - - -
- - -
-
- - - - -
- We are not able to satify your request because an error has happened. -
Message : ${errorMessage} -
- - ${stackTrace} -
- -
- -
-
-
-
- - \ No newline at end of file + + +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> + + + + QMan Administration Console + + +
+ + + + +
+ + +
+
+ + + + +
+ We are not able to satify your request because an error has happened. +
Message : ${errorMessage} +
+ + ${stackTrace} +
+ +
+ +
+
+
+
+ + diff --git a/java/management/client/console/fragments/header.jsp b/java/management/client/console/fragments/header.jsp index c835dc1bef..b401fee7a0 100644 --- a/java/management/client/console/fragments/header.jsp +++ b/java/management/client/console/fragments/header.jsp @@ -1,15 +1,36 @@ - \ No newline at end of file + + + diff --git a/java/management/client/console/fragments/menu.jsp b/java/management/client/console/fragments/menu.jsp index 971123e996..6924fd5d43 100644 --- a/java/management/client/console/fragments/menu.jsp +++ b/java/management/client/console/fragments/menu.jsp @@ -1,10 +1,31 @@ - + + + diff --git a/java/management/client/console/images/style.css b/java/management/client/console/images/style.css index f8dece6f32..a32682fa2f 100644 --- a/java/management/client/console/images/style.css +++ b/java/management/client/console/images/style.css @@ -1,181 +1,202 @@ -body -{ - margin-left: 0px; - margin-top: 0px; - margin-right: 0px; - margin-bottom: 0px; -} - -tr th { - padding: 4px 8px 4px 8px; - background: #5E7796; - border: 1px solid #CCC; - color:#b8ce83; - font-size: smaller; -} - -fieldset -{ - font-size: xx-small; -} - -#header -{ - width:1024px; -} - -#content -{ - width:1024px; -} - -#contenttext -{ - float:left; width:824px; - background-color:#FFFFFF; - border-left:solid 1px #999999; border-right:solid 1px #999999; - border-bottom:solid 1px #999999; border-top:dotted 1px #CCCCCC; - min-height:360px; -} - -#asf-header -{ - float:left; - width:1007px; - height:110px; - background-color:#FFFFFF; - border-right:solid 1px #999999; - border-left:solid 1px #999999; -} - -#pagetitle -{ - position:relative; - float:left; - width:1024px; - height:110px; - background-color:#FFFFFF; -} - -#title -{ - position:absolute; - right:20px; - bottom:0px; - width:1008px; -} - -#menu -{ - float:left; width: 190px; margin: 0 0 0 -7px; -} - -.panel{ - padding:12px; - margin: 5px; - padding:10px; -} - -.bodytext { - font: 0.7em Tahoma, sans-serif; - color: #666666; -} - -.titletext { - font: 0.7em Tahoma, sans-serif; - font-size:36px; - font-weight:bold; - color: #CCCCCC; -} - -.orangelogotext { - font: 0.7em Tahoma, sans-serif; - font-size:36px; - font-weight:bold; - color:#FF9900; -} -.orangetitle { - font: 0.7em Tahoma, sans-serif; - font-size:24px; - font-weight:bold; - color:#FF9900; -} - -.bluetitle { - font: 0.7em Tahoma, sans-serif; - font-size:24px; - font-weight:bold; - color:#369; -} - -#linksmenu a{ - float:right; - width:183px; - height:20px; - background-color:#5E7796; - border-left:solid 1px #FFFFFF; - border-bottom:solid 1px #FFFFFF; - font: 0.7em Tahoma, sans-serif; - font-size: 11px; - font-weight:bold; - color: #FFFFFF; - text-decoration:none; - padding-top:5px; -} -#linksmenu a:hover -{ - background-color:#336; -} - - -#wsdmmenu -{ - float:left; - position: relative; - width: 600px; - font-size:75%; - margin: 0 0 0px 5px; - line-height:normal; -} - -#wsdmmenu ul -{ - margin:0; - padding:0px 0px 0 0px; - list-style: none; -} - -#wsdmmenu li -{ - display:inline; - margin:0; - padding:0; -} - -#wsdmmenu a { - float:left; - background: url(menuleft.gif) no-repeat left top; - margin:0; - padding:0 0 0 4px; - text-decoration:none; -} - -#wsdmmenu a span { - float:left; - display:block; - background: url(menuright.gif) no-repeat right top; - padding:5px 15px 4px 6px; - color:#888; -} - -#wsdmmenu a span {float:none;} - -#wsdmmenu a:hover -{ - background-position:0% -42px; -} - -#wsdmmenu a:hover span -{ - background-position:100% -42px; -} \ No newline at end of file +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + +body +{ + margin-left: 0px; + margin-top: 0px; + margin-right: 0px; + margin-bottom: 0px; +} + +tr th { + padding: 4px 8px 4px 8px; + background: #5E7796; + border: 1px solid #CCC; + color:#b8ce83; + font-size: smaller; +} + +fieldset +{ + font-size: xx-small; +} + +#header +{ + width:1024px; +} + +#content +{ + width:1024px; +} + +#contenttext +{ + float:left; width:824px; + background-color:#FFFFFF; + border-left:solid 1px #999999; border-right:solid 1px #999999; + border-bottom:solid 1px #999999; border-top:dotted 1px #CCCCCC; + min-height:360px; +} + +#asf-header +{ + float:left; + width:1007px; + height:110px; + background-color:#FFFFFF; + border-right:solid 1px #999999; + border-left:solid 1px #999999; +} + +#pagetitle +{ + position:relative; + float:left; + width:1024px; + height:110px; + background-color:#FFFFFF; +} + +#title +{ + position:absolute; + right:20px; + bottom:0px; + width:1008px; +} + +#menu +{ + float:left; width: 190px; margin: 0 0 0 -7px; +} + +.panel{ + padding:12px; + margin: 5px; + padding:10px; +} + +.bodytext { + font: 0.7em Tahoma, sans-serif; + color: #666666; +} + +.titletext { + font: 0.7em Tahoma, sans-serif; + font-size:36px; + font-weight:bold; + color: #CCCCCC; +} + +.orangelogotext { + font: 0.7em Tahoma, sans-serif; + font-size:36px; + font-weight:bold; + color:#FF9900; +} +.orangetitle { + font: 0.7em Tahoma, sans-serif; + font-size:24px; + font-weight:bold; + color:#FF9900; +} + +.bluetitle { + font: 0.7em Tahoma, sans-serif; + font-size:24px; + font-weight:bold; + color:#369; +} + +#linksmenu a{ + float:right; + width:183px; + height:20px; + background-color:#5E7796; + border-left:solid 1px #FFFFFF; + border-bottom:solid 1px #FFFFFF; + font: 0.7em Tahoma, sans-serif; + font-size: 11px; + font-weight:bold; + color: #FFFFFF; + text-decoration:none; + padding-top:5px; +} +#linksmenu a:hover +{ + background-color:#336; +} + + +#wsdmmenu +{ + float:left; + position: relative; + width: 600px; + font-size:75%; + margin: 0 0 0px 5px; + line-height:normal; +} + +#wsdmmenu ul +{ + margin:0; + padding:0px 0px 0 0px; + list-style: none; +} + +#wsdmmenu li +{ + display:inline; + margin:0; + padding:0; +} + +#wsdmmenu a { + float:left; + background: url(menuleft.gif) no-repeat left top; + margin:0; + padding:0 0 0 4px; + text-decoration:none; +} + +#wsdmmenu a span { + float:left; + display:block; + background: url(menuright.gif) no-repeat right top; + padding:5px 15px 4px 6px; + color:#888; +} + +#wsdmmenu a span {float:none;} + +#wsdmmenu a:hover +{ + background-position:0% -42px; +} + +#wsdmmenu a:hover span +{ + background-position:100% -42px; +} diff --git a/java/management/client/console/jmx_perspective.jsp b/java/management/client/console/jmx_perspective.jsp index e1d421e701..5d276a0edc 100644 --- a/java/management/client/console/jmx_perspective.jsp +++ b/java/management/client/console/jmx_perspective.jsp @@ -1,136 +1,157 @@ -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> -<%@page import="org.apache.qpid.management.web.action.BrokerModel"%> -<%@page import="java.util.Set"%> -<%@page import="javax.management.ObjectName"%> -<%@page import="org.apache.qpid.management.Names"%> -<%@page import="java.util.List"%> - - - - QMan Administration Console - - -
- - - - -
- - -
-
- -
-
-
- - - - - - - -
-
- ObjectName -
    - -
  • - -
    • -     -
-
-
-
- Attributes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeValueAccess
-
- 		-
- Operations - - - - - - - - - - - - - - - - - - - - - - - -
NameArguments
-
    - -
  • - () -
    • -     -
-
- - - - - - - - - - - - - - - - - \ No newline at end of file + + +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> +<%@page import="org.apache.qpid.management.web.action.BrokerModel"%> +<%@page import="java.util.Set"%> +<%@page import="javax.management.ObjectName"%> +<%@page import="org.apache.qpid.management.Names"%> +<%@page import="java.util.List"%> + + + + QMan Administration Console + + +
+ + + + +
+ + +
+
+ +
+
+
+ + + + + + + +
+
+ ObjectName +
    + +
  • + +
    • +     +
+
+
+
+ Attributes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeValueAccess
+
+ 		+
+ Operations + + + + + + + + + + + + + + + + + + + + + + + +
NameArguments
+
    + +
  • + () +
    • +     +
+
+ + + + + + + + + + + + + + + + + diff --git a/java/management/client/console/logging_configuration.jsp b/java/management/client/console/logging_configuration.jsp index 764bc5a85c..89f10567fa 100644 --- a/java/management/client/console/logging_configuration.jsp +++ b/java/management/client/console/logging_configuration.jsp @@ -1,220 +1,241 @@ -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> - - - - QMan Administration Console - - -
- - - - -
- - -
-
- -
- - - - - - - - - - - - - - - - - - - -
-
- WSDL & RDM Debugger - - - - - -
- - - - - - - - - - - When this flag is checked all WSDL and RMD messages are written on log file (or console depending on your configuration.) -
-
-
-
- SOAP Messages Debugger - - - - - - -
- - - - - - - - - - - When this flag is checked all SOAP messages (requests & responses) are written on log file (or console depending on your configuration.) -
-
-
-
- QMan Logger Level - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - This is the current priority level set for QMan module (and sub-modules). Note that a WARNING level is recomended in production. -
-
-
-
- Web Server Logger Level - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - This is the current priority level set for QMan module (and sub-modules). Note that a WARNING level is recomended in production. -
-
-
- -
-

- Note that in general a DEBUG level is not reccommended in production (especially for WSDL and SOAP debugger). -
- -
-
-
-
- - \ No newline at end of file + + +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> + + + + QMan Administration Console + + +
+ + + + +
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + +
+
+ WSDL & RDM Debugger + + + + + +
+ + + + + + + + + + + When this flag is checked all WSDL and RMD messages are written on log file (or console depending on your configuration.) +
+
+
+
+ SOAP Messages Debugger + + + + + + +
+ + + + + + + + + + + When this flag is checked all SOAP messages (requests & responses) are written on log file (or console depending on your configuration.) +
+
+
+
+ QMan Logger Level + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + This is the current priority level set for QMan module (and sub-modules). Note that a WARNING level is recomended in production. +
+
+
+
+ Web Server Logger Level + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + This is the current priority level set for QMan module (and sub-modules). Note that a WARNING level is recomended in production. +
+
+
+ +
+

+ Note that in general a DEBUG level is not reccommended in production (especially for WSDL and SOAP debugger). +
+ +
+
+
+
+ + diff --git a/java/management/client/console/resources_management.jsp b/java/management/client/console/resources_management.jsp index 1541f3a5bc..4a6f9efed6 100644 --- a/java/management/client/console/resources_management.jsp +++ b/java/management/client/console/resources_management.jsp @@ -1,84 +1,105 @@ -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> -<%@page import="org.apache.qpid.management.web.action.BrokerModel"%> -<%@page import="java.util.Set"%> -<%@page import="javax.management.ObjectName"%> -<%@page import="org.apache.qpid.management.Names"%> -<%@page import="java.util.List"%> - -<% - BrokerModel model = (BrokerModel) request.getAttribute("model"); -%> - - - - QMan Administration Console - - -
- - - - -
- - - -
-
- -
-
-
- - -<% - if (model != null ){ - Set categoryNames = model.getCategoryNames(); - for(String categoryName : categoryNames) - { - List categoryObjects = model.getCategory(categoryName); -%> - - - -<% - } - } else { -%> -
-
- <%=categoryName%> -

- -

-
- - -
Sorry, but it seems that QMan is not connected with any broker...
-<% - } -%> -
- -
-
- - \ No newline at end of file + + +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> +<%@page import="org.apache.qpid.management.web.action.BrokerModel"%> +<%@page import="java.util.Set"%> +<%@page import="javax.management.ObjectName"%> +<%@page import="org.apache.qpid.management.Names"%> +<%@page import="java.util.List"%> + +<% + BrokerModel model = (BrokerModel) request.getAttribute("model"); +%> + + + + QMan Administration Console + + +
+ + + + +
+ + + +
+
+ +
+
+
+ + +<% + if (model != null ){ + Set categoryNames = model.getCategoryNames(); + for(String categoryName : categoryNames) + { + List categoryObjects = model.getCategory(categoryName); +%> + + + +<% + } + } else { +%> +
+
+ <%=categoryName%> +

+ +

+
+ + +
Sorry, but it seems that QMan is not connected with any broker...
+<% + } +%> +
+ +
+
+ + diff --git a/java/management/client/console/tbd.jsp b/java/management/client/console/tbd.jsp index 486a4cff86..3c1c87a7b0 100644 --- a/java/management/client/console/tbd.jsp +++ b/java/management/client/console/tbd.jsp @@ -1,27 +1,48 @@ -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> - - - - QMan Administration Console - - -
- - - - -
- - -
-
- - Sorry, this feature is not yet available! - -
-
-
-
- - \ No newline at end of file + + +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> + + + + QMan Administration Console + + +
+ + + + +
+ + +
+
+ + Sorry, this feature is not yet available! + +
+
+
+
+ + diff --git a/java/management/client/console/wsdm_operations_perspective.jsp b/java/management/client/console/wsdm_operations_perspective.jsp index f4038b2e14..50f67c4492 100644 --- a/java/management/client/console/wsdm_operations_perspective.jsp +++ b/java/management/client/console/wsdm_operations_perspective.jsp @@ -1,153 +1,174 @@ -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> -<%@page import="org.apache.qpid.management.web.action.BrokerModel"%> -<%@page import="java.util.Set"%> -<%@page import="javax.management.ObjectName"%> -<%@page import="org.apache.qpid.management.Names"%> -<%@page import="java.util.*"%> -<% - Map java2Xml = new HashMap(); -java2Xml.put(UUID.class.getName(),"qman:uuid"); -java2Xml.put(Long.class.getName(),"xsd:long"); -java2Xml.put(long.class.getName(),"xsd:long"); -java2Xml.put(Boolean.class.getName(),"xsd:boolean"); -java2Xml.put(boolean.class.getName(),"xsd:boolean"); -java2Xml.put(Double.class.getName(),"xsd:double"); -java2Xml.put(double.class.getName(),"xsd:double"); -java2Xml.put(Float.class.getName(),"xsd:float"); -java2Xml.put(float.class.getName(),"xsd:float"); -java2Xml.put(Integer.class.getName(),"xsd:integer"); -java2Xml.put(int.class.getName(),"xsd:integer"); -java2Xml.put(Short.class.getName(),"xsd:short"); -java2Xml.put(short.class.getName(),"xsd:short"); -java2Xml.put(String.class.getName(),"xsd:string"); -java2Xml.put(URI.class.getName(),"xsd:anyURI"); -java2Xml.put(Date.class.getName(),"xsd:dateTime"); -java2Xml.put(QName.class.getName(),"xsd:QName"); -java2Xml.put(Element.class.getName(),"xsd:element"); -java2Xml.put(byte[].class.getName(),"xsd:base64Binary"); -java2Xml.put(Long[].class.getName(),"qman:arrayOfLong"); -java2Xml.put(long[].class.getName(),"qman:arrayOfLong"); -java2Xml.put(Boolean[].class.getName(),"qman:arrayOfBoolean"); -java2Xml.put(boolean[].class.getName(),"qman:arrayOfBoolean"); -java2Xml.put(Double[].class.getName(),"qman:arrayOfDouble"); -java2Xml.put(double[].class.getName(),"qman:arrayOfDouble"); -java2Xml.put(Float[].class.getName(),"qman:arrayOfFloat"); -java2Xml.put(float[].class.getName(),"qman:arrayOfFloat"); -java2Xml.put(Integer[].class.getName(),"qman:arrayOfInteger"); -java2Xml.put(int[].class.getName(),"qman:arrayOfInteger"); -java2Xml.put(Short[].class.getName(),"qman:arrayOfShort"); -java2Xml.put(short[].class.getName(),"qman:arrayOfShort"); -java2Xml.put(String[].class.getName(),"qman:arrayOfString"); -java2Xml.put(URI[].class.getName(),"qman:arrayOfURI"); -java2Xml.put(Date[].class.getName(),"qman:arrayOfDate"); -java2Xml.put(Map.class.getName(),"qman:map"); -java2Xml.put(HashMap.class.getName(),"qman:map"); - -pageContext.setAttribute("types",java2Xml); -%> -<%@page import="java.net.URI"%> -<%@page import="javax.xml.namespace.QName"%> -<%@page import="org.w3c.dom.Element"%> - - - - QMan Administration Console - - -
- - - - -
- - -
-
- -
-
-
- - - - - - - - - - - -
-
- Resource ID -
    - -
  • - -
    • -     -
-
-
-
- -
-
-
- Attributes - - - - - - - - - - - - - - - - - - - - - -
NameArgumentsFaults
-
    - -
  • - () -
    • -     -
- 		-
    -
  • qman:EntityInstanceNotFoundFault
    • -
  • qman:OperationInvocationFault
    • -
  • qman:QManFault
    • -
-
-
-
- -
-
-
-
- - \ No newline at end of file + + +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> +<%@page import="org.apache.qpid.management.web.action.BrokerModel"%> +<%@page import="java.util.Set"%> +<%@page import="javax.management.ObjectName"%> +<%@page import="org.apache.qpid.management.Names"%> +<%@page import="java.util.*"%> +<% + Map java2Xml = new HashMap(); +java2Xml.put(UUID.class.getName(),"qman:uuid"); +java2Xml.put(Long.class.getName(),"xsd:long"); +java2Xml.put(long.class.getName(),"xsd:long"); +java2Xml.put(Boolean.class.getName(),"xsd:boolean"); +java2Xml.put(boolean.class.getName(),"xsd:boolean"); +java2Xml.put(Double.class.getName(),"xsd:double"); +java2Xml.put(double.class.getName(),"xsd:double"); +java2Xml.put(Float.class.getName(),"xsd:float"); +java2Xml.put(float.class.getName(),"xsd:float"); +java2Xml.put(Integer.class.getName(),"xsd:integer"); +java2Xml.put(int.class.getName(),"xsd:integer"); +java2Xml.put(Short.class.getName(),"xsd:short"); +java2Xml.put(short.class.getName(),"xsd:short"); +java2Xml.put(String.class.getName(),"xsd:string"); +java2Xml.put(URI.class.getName(),"xsd:anyURI"); +java2Xml.put(Date.class.getName(),"xsd:dateTime"); +java2Xml.put(QName.class.getName(),"xsd:QName"); +java2Xml.put(Element.class.getName(),"xsd:element"); +java2Xml.put(byte[].class.getName(),"xsd:base64Binary"); +java2Xml.put(Long[].class.getName(),"qman:arrayOfLong"); +java2Xml.put(long[].class.getName(),"qman:arrayOfLong"); +java2Xml.put(Boolean[].class.getName(),"qman:arrayOfBoolean"); +java2Xml.put(boolean[].class.getName(),"qman:arrayOfBoolean"); +java2Xml.put(Double[].class.getName(),"qman:arrayOfDouble"); +java2Xml.put(double[].class.getName(),"qman:arrayOfDouble"); +java2Xml.put(Float[].class.getName(),"qman:arrayOfFloat"); +java2Xml.put(float[].class.getName(),"qman:arrayOfFloat"); +java2Xml.put(Integer[].class.getName(),"qman:arrayOfInteger"); +java2Xml.put(int[].class.getName(),"qman:arrayOfInteger"); +java2Xml.put(Short[].class.getName(),"qman:arrayOfShort"); +java2Xml.put(short[].class.getName(),"qman:arrayOfShort"); +java2Xml.put(String[].class.getName(),"qman:arrayOfString"); +java2Xml.put(URI[].class.getName(),"qman:arrayOfURI"); +java2Xml.put(Date[].class.getName(),"qman:arrayOfDate"); +java2Xml.put(Map.class.getName(),"qman:map"); +java2Xml.put(HashMap.class.getName(),"qman:map"); + +pageContext.setAttribute("types",java2Xml); +%> +<%@page import="java.net.URI"%> +<%@page import="javax.xml.namespace.QName"%> +<%@page import="org.w3c.dom.Element"%> + + + + QMan Administration Console + + +
+ + + + +
+ + +
+
+ +
+
+
+ + + + + + + + + + + +
+
+ Resource ID +
    + +
  • + +
    • +     +
+
+
+
+ +
+
+
+ Attributes + + + + + + + + + + + + + + + + + + + + + +
NameArgumentsFaults
+
    + +
  • + () +
    • +     +
+ 		+
    +
  • qman:EntityInstanceNotFoundFault
    • +
  • qman:OperationInvocationFault
    • +
  • qman:QManFault
    • +
+
+
+
+ +
+
+
+
+ + diff --git a/java/management/client/console/wsdm_properties_perspective.jsp b/java/management/client/console/wsdm_properties_perspective.jsp index 2e8699e309..7769abc71c 100644 --- a/java/management/client/console/wsdm_properties_perspective.jsp +++ b/java/management/client/console/wsdm_properties_perspective.jsp @@ -1,197 +1,218 @@ -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> -<%@page import="org.apache.qpid.management.web.action.BrokerModel"%> -<%@page import="java.util.Set"%> -<%@page import="javax.management.ObjectName"%> -<%@page import="org.apache.qpid.management.Names"%> -<%@page import="java.util.List"%> -<%@page import="java.util.*"%> - -<% - Map java2Xml = new HashMap(); -java2Xml.put(UUID.class.getName(),"qman:uuid"); -java2Xml.put(Long.class.getName(),"xsd:long"); -java2Xml.put(long.class.getName(),"xsd:long"); -java2Xml.put(Boolean.class.getName(),"xsd:boolean"); -java2Xml.put(boolean.class.getName(),"xsd:boolean"); -java2Xml.put(Double.class.getName(),"xsd:double"); -java2Xml.put(double.class.getName(),"xsd:double"); -java2Xml.put(Float.class.getName(),"xsd:float"); -java2Xml.put(float.class.getName(),"xsd:float"); -java2Xml.put(Integer.class.getName(),"xsd:integer"); -java2Xml.put(int.class.getName(),"xsd:integer"); -java2Xml.put(Short.class.getName(),"xsd:short"); -java2Xml.put(short.class.getName(),"xsd:short"); -java2Xml.put(String.class.getName(),"xsd:string"); -java2Xml.put(URI.class.getName(),"xsd:anyURI"); -java2Xml.put(Date.class.getName(),"xsd:dateTime"); -java2Xml.put(QName.class.getName(),"xsd:QName"); -java2Xml.put(Element.class.getName(),"xsd:element"); -java2Xml.put(byte[].class.getName(),"xsd:base64Binary"); -java2Xml.put(Long[].class.getName(),"qman:arrayOfLong"); -java2Xml.put(long[].class.getName(),"qman:arrayOfLong"); -java2Xml.put(Boolean[].class.getName(),"qman:arrayOfBoolean"); -java2Xml.put(boolean[].class.getName(),"qman:arrayOfBoolean"); -java2Xml.put(Double[].class.getName(),"qman:arrayOfDouble"); -java2Xml.put(double[].class.getName(),"qman:arrayOfDouble"); -java2Xml.put(Float[].class.getName(),"qman:arrayOfFloat"); -java2Xml.put(float[].class.getName(),"qman:arrayOfFloat"); -java2Xml.put(Integer[].class.getName(),"qman:arrayOfInteger"); -java2Xml.put(int[].class.getName(),"qman:arrayOfInteger"); -java2Xml.put(Short[].class.getName(),"qman:arrayOfShort"); -java2Xml.put(short[].class.getName(),"qman:arrayOfShort"); -java2Xml.put(String[].class.getName(),"qman:arrayOfString"); -java2Xml.put(URI[].class.getName(),"qman:arrayOfURI"); -java2Xml.put(Date[].class.getName(),"qman:arrayOfDate"); -java2Xml.put(Map.class.getName(),"qman:map"); -java2Xml.put(HashMap.class.getName(),"qman:map"); - -pageContext.setAttribute("types",java2Xml); -%> -<%@page import="java.net.URI"%> -<%@page import="javax.xml.namespace.QName"%> -<%@page import="org.w3c.dom.Element"%> - - - - QMan Administration Console - - -
- - - - -
- - -
-
- -
-
-
- - - - - - - - - - - -
-
- Resource ID -
    - -
  • - -
    • -     -
-
-
-
- -
-
-
- Attributes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeValueMutableAccessValid ValuesStatic ValuesInitial Values
- √ - <%-- - - --%> - - N.A. -<%-- -
    - -
  • - -
    • -     -
---%> - 		- N.A. -<%-- -
    - -
  • - -
    • -     -
---%> - 		- N.A. -<%-- -
    - -
  • - -
    • -     -
---%> -
-
-
- -
-
-
-
- - \ No newline at end of file + + +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> +<%@page import="org.apache.qpid.management.web.action.BrokerModel"%> +<%@page import="java.util.Set"%> +<%@page import="javax.management.ObjectName"%> +<%@page import="org.apache.qpid.management.Names"%> +<%@page import="java.util.List"%> +<%@page import="java.util.*"%> + +<% + Map java2Xml = new HashMap(); +java2Xml.put(UUID.class.getName(),"qman:uuid"); +java2Xml.put(Long.class.getName(),"xsd:long"); +java2Xml.put(long.class.getName(),"xsd:long"); +java2Xml.put(Boolean.class.getName(),"xsd:boolean"); +java2Xml.put(boolean.class.getName(),"xsd:boolean"); +java2Xml.put(Double.class.getName(),"xsd:double"); +java2Xml.put(double.class.getName(),"xsd:double"); +java2Xml.put(Float.class.getName(),"xsd:float"); +java2Xml.put(float.class.getName(),"xsd:float"); +java2Xml.put(Integer.class.getName(),"xsd:integer"); +java2Xml.put(int.class.getName(),"xsd:integer"); +java2Xml.put(Short.class.getName(),"xsd:short"); +java2Xml.put(short.class.getName(),"xsd:short"); +java2Xml.put(String.class.getName(),"xsd:string"); +java2Xml.put(URI.class.getName(),"xsd:anyURI"); +java2Xml.put(Date.class.getName(),"xsd:dateTime"); +java2Xml.put(QName.class.getName(),"xsd:QName"); +java2Xml.put(Element.class.getName(),"xsd:element"); +java2Xml.put(byte[].class.getName(),"xsd:base64Binary"); +java2Xml.put(Long[].class.getName(),"qman:arrayOfLong"); +java2Xml.put(long[].class.getName(),"qman:arrayOfLong"); +java2Xml.put(Boolean[].class.getName(),"qman:arrayOfBoolean"); +java2Xml.put(boolean[].class.getName(),"qman:arrayOfBoolean"); +java2Xml.put(Double[].class.getName(),"qman:arrayOfDouble"); +java2Xml.put(double[].class.getName(),"qman:arrayOfDouble"); +java2Xml.put(Float[].class.getName(),"qman:arrayOfFloat"); +java2Xml.put(float[].class.getName(),"qman:arrayOfFloat"); +java2Xml.put(Integer[].class.getName(),"qman:arrayOfInteger"); +java2Xml.put(int[].class.getName(),"qman:arrayOfInteger"); +java2Xml.put(Short[].class.getName(),"qman:arrayOfShort"); +java2Xml.put(short[].class.getName(),"qman:arrayOfShort"); +java2Xml.put(String[].class.getName(),"qman:arrayOfString"); +java2Xml.put(URI[].class.getName(),"qman:arrayOfURI"); +java2Xml.put(Date[].class.getName(),"qman:arrayOfDate"); +java2Xml.put(Map.class.getName(),"qman:map"); +java2Xml.put(HashMap.class.getName(),"qman:map"); + +pageContext.setAttribute("types",java2Xml); +%> +<%@page import="java.net.URI"%> +<%@page import="javax.xml.namespace.QName"%> +<%@page import="org.w3c.dom.Element"%> + + + + QMan Administration Console + + +
+ + + + +
+ + +
+
+ +
+
+
+ + + + + + + + + + + +
+
+ Resource ID +
    + +
  • + +
    • +     +
+
+
+
+ +
+
+
+ Attributes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeValueMutableAccessValid ValuesStatic ValuesInitial Values
+ √ + <%-- + + --%> + + N.A. +<%-- +
    + +
  • + +
    • +     +
+--%> + 		+ N.A. +<%-- +
    + +
  • + +
    • +     +
+--%> + 		+ N.A. +<%-- +
    + +
  • + +
    • +     +
+--%> +
+
+
+ +
+
+
+
+ + diff --git a/java/management/client/console/wsdm_rmd_perspective.jsp b/java/management/client/console/wsdm_rmd_perspective.jsp index fe70930627..083732668b 100644 --- a/java/management/client/console/wsdm_rmd_perspective.jsp +++ b/java/management/client/console/wsdm_rmd_perspective.jsp @@ -1,78 +1,99 @@ -<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix="c"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/xml" prefix="x"%> - -<%@page import="org.apache.qpid.management.web.action.BrokerModel"%> -<%@page import="java.util.Set"%> -<%@page import="javax.management.ObjectName"%> -<%@page import="org.apache.qpid.management.Names"%> -<%@page import="java.util.*"%> -<%@page import="java.net.URI"%> -<%@page import="javax.xml.namespace.QName"%> -<%@page import="org.w3c.dom.Element"%> - - - - QMan Administration Console - - -
- - - - -
- - -
-
- -
-
-
- - - - - - - - - - - -
-
- Resource ID -
    - -
  • - -
    • -     -
-
-
-
- -
-
-
-
-
-
- -
-
-
-
- - \ No newline at end of file + + +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix="c"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/xml" prefix="x"%> + +<%@page import="org.apache.qpid.management.web.action.BrokerModel"%> +<%@page import="java.util.Set"%> +<%@page import="javax.management.ObjectName"%> +<%@page import="org.apache.qpid.management.Names"%> +<%@page import="java.util.*"%> +<%@page import="java.net.URI"%> +<%@page import="javax.xml.namespace.QName"%> +<%@page import="org.w3c.dom.Element"%> + + + + QMan Administration Console + + +
+ + + + +
+ + +
+
+ +
+
+
+ + + + + + + + + + + +
+
+ Resource ID +
    + +
  • + +
    • +     +
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+ + diff --git a/java/management/client/console/wsdm_wsdl_perspective.jsp b/java/management/client/console/wsdm_wsdl_perspective.jsp index 3759459842..0674c51a97 100644 --- a/java/management/client/console/wsdm_wsdl_perspective.jsp +++ b/java/management/client/console/wsdm_wsdl_perspective.jsp @@ -1,78 +1,99 @@ -<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix="c"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/xml" prefix="x"%> - -<%@page import="org.apache.qpid.management.web.action.BrokerModel"%> -<%@page import="java.util.Set"%> -<%@page import="javax.management.ObjectName"%> -<%@page import="org.apache.qpid.management.Names"%> -<%@page import="java.util.*"%> -<%@page import="java.net.URI"%> -<%@page import="javax.xml.namespace.QName"%> -<%@page import="org.w3c.dom.Element"%> - - - - QMan Administration Console - - -
- - - - -
- - -
-
- -
-
-
- - - - - - - - - - - -
-
- Resource ID -
    - -
  • - -
    • -     -
-
-
-
- -
-
-
-
-
-
- -
-
-
-
- - \ No newline at end of file + + +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix="c"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/xml" prefix="x"%> + +<%@page import="org.apache.qpid.management.web.action.BrokerModel"%> +<%@page import="java.util.Set"%> +<%@page import="javax.management.ObjectName"%> +<%@page import="org.apache.qpid.management.Names"%> +<%@page import="java.util.*"%> +<%@page import="java.net.URI"%> +<%@page import="javax.xml.namespace.QName"%> +<%@page import="org.w3c.dom.Element"%> + + + + QMan Administration Console + + +
+ + + + +
+ + +
+
+ +
+
+
+ + + + + + + + + + + +
+
+ Resource ID +
    + +
  • + +
    • +     +
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+ + diff --git a/java/management/client/etc/jetty.xml b/java/management/client/etc/jetty.xml index 38a4775641..975053a518 100644 --- a/java/management/client/etc/jetty.xml +++ b/java/management/client/etc/jetty.xml @@ -1,4 +1,25 @@ + + true @@ -23,4 +44,4 @@ /app/qman - \ No newline at end of file + diff --git a/java/management/client/etc/log4j.xml b/java/management/client/etc/log4j.xml index 0b63512211..14ee3b2441 100644 --- a/java/management/client/etc/log4j.xml +++ b/java/management/client/etc/log4j.xml @@ -1,4 +1,25 @@ + + @@ -62,15 +83,15 @@ - + - - - + + + - + - \ No newline at end of file + diff --git a/java/management/client/src/main/java/muse.xml b/java/management/client/src/main/java/muse.xml index cf651c34ac..29a1c02e0c 100644 --- a/java/management/client/src/main/java/muse.xml +++ b/java/management/client/src/main/java/muse.xml @@ -1,188 +1,209 @@ - - - - java.lang.Object - org.apache.qpid.management.wsdm.muse.serializer.ObjectSerializer - - - java.util.Map - org.apache.qpid.management.wsdm.muse.serializer.MapSerializer - - - java.util.HashMap - org.apache.qpid.management.wsdm.muse.serializer.MapSerializer - - - java.util.UUID - org.apache.qpid.management.wsdm.muse.serializer.UUIDSerializer - - - org.apache.qpid.management.wsdm.capabilities.Result - org.apache.qpid.management.wsdm.muse.serializer.InvocationResultSerializer - - - java.util.Date - org.apache.qpid.management.wsdm.muse.serializer.DateSerializer - - - org.apache.muse.ws.resource.impl.WsResourceRouter - - log/muse.log - SEVERE - - - org.apache.muse.core.routing.RouterFilePersistence - router-entries - - - - consumer - - wsdl/WS-BaseNotification-1_3.wsdl - wsntw:NotificationConsumer - - org.apache.qpid.management.wsdm.common.QManResourceIdFactory - org.apache.muse.core.SimpleResource - - http://docs.oasis-open.org/wsn/bw-2/NotificationConsumer - org.apache.muse.ws.notification.impl.SimpleNotificationConsumer - - - http://amqp.apache.org/qpid/management/qman/consumer - org.apache.qpid.management.wsdm.capabilities.ConsumerCapability - - - - SubscriptionManager - - wsdl/WS-BaseNotification-1_3.wsdl - wsntw:SubscriptionManager - - org.apache.qpid.management.wsdm.common.QManResourceIdFactory - org.apache.muse.ws.resource.impl.SimpleWsResource - - http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata - org.apache.muse.ws.metadata.impl.SimpleMetadataExchange - - - http://docs.oasis-open.org/wsrf/rpw-2/Get - org.apache.muse.ws.resource.properties.get.impl.SimpleGetCapability - - - http://docs.oasis-open.org/wsn/bw-2/SubscriptionManager - org.apache.muse.ws.notification.impl.SimpleSubscriptionManager - - trace-notifications - true - - - - http://docs.oasis-open.org/wsrf/rlw-2/ImmediateResourceTermination - org.apache.muse.ws.resource.lifetime.impl.SimpleImmediateTermination - - - http://docs.oasis-open.org/wsrf/rlw-2/ScheduledResourceTermination - org.apache.muse.ws.resource.lifetime.impl.SimpleScheduledTermination - - - validate-wsrp-schema - false - - - - adapter - - wsdl/QManAdapter.wsdl - qman:QManAdapterPortType - - org.apache.qpid.management.wsdm.common.QManResourceIdFactory - org.apache.muse.ws.resource.impl.SimpleWsResource - - http://amqp.apache.org/qpid/management/qman - org.apache.qpid.management.wsdm.capabilities.QManAdapterCapability - - - http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata - org.apache.muse.ws.metadata.impl.SimpleMetadataExchange - - - http://docs.oasis-open.org/wsrf/rpw-2/Get - org.apache.muse.ws.resource.properties.get.impl.SimpleGetCapability - - - http://docs.oasis-open.org/wsrf/rpw-2/Query - org.apache.muse.ws.resource.properties.query.impl.SimpleQueryCapability - - - http://docs.oasis-open.org/wsrf/sgw-2/ServiceGroup - org.apache.muse.ws.resource.sg.impl.SimpleServiceGroup - - - http://docs.oasis-open.org/wsn/bw-2/NotificationProducer - org.apache.muse.ws.notification.impl.SimpleNotificationProducer - - - validate-wsrp-schema - false - - - - QManWsResource - - - wsdl/QManWsResource.wsdl - qman:QManWsResourcePortType - - org.apache.qpid.management.wsdm.common.ObjectNameIdFactory - org.apache.qpid.management.wsdm.muse.resources.QManWsResource - - http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata - org.apache.qpid.management.wsdm.capabilities.QManMetadataExchangeCapability - - - http://docs.oasis-open.org/wsrf/rpw-2/Get - org.apache.muse.ws.resource.properties.get.impl.SimpleGetCapability - - - http://docs.oasis-open.org/wsrf/rpw-2/Query - org.apache.muse.ws.resource.properties.query.impl.SimpleQueryCapability - - - http://docs.oasis-open.org/wsrf/rpw-2/Set - org.apache.muse.ws.resource.properties.set.impl.SimpleSetCapability - - - http://docs.oasis-open.org/wsrf/rpw-2/Put - org.apache.muse.ws.resource.properties.set.impl.SimpleSetCapability - - - - ServiceGroupEntry - - /wsdl/WS-ServiceGroupEntry-1_2.wsdl - wsrf-sgw:ServiceGroupEntryPortType - - org.apache.qpid.management.wsdm.common.QManResourceIdFactory - org.apache.muse.ws.resource.impl.SimpleWsResource - - http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata - org.apache.muse.ws.metadata.impl.SimpleMetadataExchange - - - http://docs.oasis-open.org/wsrf/rpw-2/Get - org.apache.muse.ws.resource.properties.get.impl.SimpleGetCapability - - - http://docs.oasis-open.org/wsrf/sgw-2/ServiceGroupEntry - org.apache.muse.ws.resource.sg.impl.SimpleEntry - - - validate-wsrp-schema - false - - - \ No newline at end of file + + + + + + java.lang.Object + org.apache.qpid.management.wsdm.muse.serializer.ObjectSerializer + + + java.util.Map + org.apache.qpid.management.wsdm.muse.serializer.MapSerializer + + + java.util.HashMap + org.apache.qpid.management.wsdm.muse.serializer.MapSerializer + + + java.util.UUID + org.apache.qpid.management.wsdm.muse.serializer.UUIDSerializer + + + org.apache.qpid.management.wsdm.capabilities.Result + org.apache.qpid.management.wsdm.muse.serializer.InvocationResultSerializer + + + java.util.Date + org.apache.qpid.management.wsdm.muse.serializer.DateSerializer + + + org.apache.muse.ws.resource.impl.WsResourceRouter + + log/muse.log + SEVERE + + + org.apache.muse.core.routing.RouterFilePersistence + router-entries + + + + consumer + + wsdl/WS-BaseNotification-1_3.wsdl + wsntw:NotificationConsumer + + org.apache.qpid.management.wsdm.common.QManResourceIdFactory + org.apache.muse.core.SimpleResource + + http://docs.oasis-open.org/wsn/bw-2/NotificationConsumer + org.apache.muse.ws.notification.impl.SimpleNotificationConsumer + + + http://amqp.apache.org/qpid/management/qman/consumer + org.apache.qpid.management.wsdm.capabilities.ConsumerCapability + + + + SubscriptionManager + + wsdl/WS-BaseNotification-1_3.wsdl + wsntw:SubscriptionManager + + org.apache.qpid.management.wsdm.common.QManResourceIdFactory + org.apache.muse.ws.resource.impl.SimpleWsResource + + http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata + org.apache.muse.ws.metadata.impl.SimpleMetadataExchange + + + http://docs.oasis-open.org/wsrf/rpw-2/Get + org.apache.muse.ws.resource.properties.get.impl.SimpleGetCapability + + + http://docs.oasis-open.org/wsn/bw-2/SubscriptionManager + org.apache.muse.ws.notification.impl.SimpleSubscriptionManager + + trace-notifications + true + + + + http://docs.oasis-open.org/wsrf/rlw-2/ImmediateResourceTermination + org.apache.muse.ws.resource.lifetime.impl.SimpleImmediateTermination + + + http://docs.oasis-open.org/wsrf/rlw-2/ScheduledResourceTermination + org.apache.muse.ws.resource.lifetime.impl.SimpleScheduledTermination + + + validate-wsrp-schema + false + + + + adapter + + wsdl/QManAdapter.wsdl + qman:QManAdapterPortType + + org.apache.qpid.management.wsdm.common.QManResourceIdFactory + org.apache.muse.ws.resource.impl.SimpleWsResource + + http://amqp.apache.org/qpid/management/qman + org.apache.qpid.management.wsdm.capabilities.QManAdapterCapability + + + http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata + org.apache.muse.ws.metadata.impl.SimpleMetadataExchange + + + http://docs.oasis-open.org/wsrf/rpw-2/Get + org.apache.muse.ws.resource.properties.get.impl.SimpleGetCapability + + + http://docs.oasis-open.org/wsrf/rpw-2/Query + org.apache.muse.ws.resource.properties.query.impl.SimpleQueryCapability + + + http://docs.oasis-open.org/wsrf/sgw-2/ServiceGroup + org.apache.muse.ws.resource.sg.impl.SimpleServiceGroup + + + http://docs.oasis-open.org/wsn/bw-2/NotificationProducer + org.apache.muse.ws.notification.impl.SimpleNotificationProducer + + + validate-wsrp-schema + false + + + + QManWsResource + + + wsdl/QManWsResource.wsdl + qman:QManWsResourcePortType + + org.apache.qpid.management.wsdm.common.ObjectNameIdFactory + org.apache.qpid.management.wsdm.muse.resources.QManWsResource + + http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata + org.apache.qpid.management.wsdm.capabilities.QManMetadataExchangeCapability + + + http://docs.oasis-open.org/wsrf/rpw-2/Get + org.apache.muse.ws.resource.properties.get.impl.SimpleGetCapability + + + http://docs.oasis-open.org/wsrf/rpw-2/Query + org.apache.muse.ws.resource.properties.query.impl.SimpleQueryCapability + + + http://docs.oasis-open.org/wsrf/rpw-2/Set + org.apache.muse.ws.resource.properties.set.impl.SimpleSetCapability + + + http://docs.oasis-open.org/wsrf/rpw-2/Put + org.apache.muse.ws.resource.properties.set.impl.SimpleSetCapability + + + + ServiceGroupEntry + + /wsdl/WS-ServiceGroupEntry-1_2.wsdl + wsrf-sgw:ServiceGroupEntryPortType + + org.apache.qpid.management.wsdm.common.QManResourceIdFactory + org.apache.muse.ws.resource.impl.SimpleWsResource + + http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata + org.apache.muse.ws.metadata.impl.SimpleMetadataExchange + + + http://docs.oasis-open.org/wsrf/rpw-2/Get + org.apache.muse.ws.resource.properties.get.impl.SimpleGetCapability + + + http://docs.oasis-open.org/wsrf/sgw-2/ServiceGroupEntry + org.apache.muse.ws.resource.sg.impl.SimpleEntry + + + validate-wsrp-schema + false + + + diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidEntity.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidEntity.java index a13da559fc..ea0acb5fd1 100644 --- a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidEntity.java +++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidEntity.java @@ -1,163 +1,184 @@ -package org.apache.qpid.management.domain.model; - -import java.util.HashMap; -import java.util.Map; - -import javax.management.Attribute; -import javax.management.AttributeList; -import javax.management.DynamicMBean; -import javax.management.MBeanInfo; -import javax.management.NotificationBroadcasterSupport; -import javax.management.ObjectName; -import javax.management.RuntimeOperationsException; - -import org.apache.qpid.management.Messages; -import org.apache.qpid.management.Names; -import org.apache.qpid.management.domain.model.type.Binary; -import org.apache.qpid.management.domain.services.QpidService; -import org.apache.qpid.management.jmx.EntityLifecycleNotification; -import org.apache.qpid.transport.util.Logger; - -/** - * Layer supertype for QMan entities. - */ -public abstract class QpidEntity extends NotificationBroadcasterSupport -{ - /** - * Layer supertype for QMan managed bean entities. - */ - abstract class QManManagedEntity implements DynamicMBean - { - // After mbean is registered with the MBean server this collection holds the mbean attribute values. - Map _attributes = new HashMap(); - - /** - * Creates or replace the given attribute. - * Note that this is not part of the management interface of this object instance and therefore will be accessible only - * from within this class. - * It is used to update directly the object attributes bypassing jmx interface. - * - * @param attributeName the name of the attribute. - * @param property newValue the new value of the attribute. - */ - void createOrReplaceAttributeValue(String attributeName, Object newValue) - { - _attributes.put(attributeName, newValue); - } - - /** - * Get the values of several attributes of the Dynamic MBean. - * - * @param attributes A list of the attributes to be retrieved. - * - * @return The list of attributes retrieved. - */ - public AttributeList getAttributes (String[] attributes) - { - if (attributes == null) - { - throw new RuntimeOperationsException(new IllegalArgumentException("Attributes array must not be null")); - } - - AttributeList result = new AttributeList(attributes.length); - for (int i = 0; i < attributes.length; i++) - { - String attributeName = attributes[i]; - try - { - result.add(new Attribute(attributeName,getAttribute(attributeName))); - } catch(Exception exception) - { - // Already logged. - } - } - return result; - } - - /** - * Returns metadata for this object instance. - */ - // Developer Note : note that this metadata is a member of the outer class definition : in that way we create - // that metadata only once and then it will be shared between all object instances (it's a readonly object) - public MBeanInfo getMBeanInfo () - { - return _metadata; - } - }; - - final Logger _logger = Logger.get(getClass()); - final static JmxService JMX_SERVICE = new JmxService(); - - final String _name; - final Binary _hash; - - final QpidPackage _parent; - MBeanInfo _metadata; - final QpidService _service; - - protected ObjectName _objectName; - - private final String _type; - - /** - * Builds a new class with the given name and package as parent. - * - * @param className the name of the class. - * @param hash the class schema hash. - * @param parentPackage the parent of this class. - */ - QpidEntity(String className, Binary hash, QpidPackage parentPackage,String type) - { - this._name = className; - this._parent = parentPackage; - this._hash = hash; - this._type = type; - this._service = new QpidService(_parent.getOwnerId()); - - _logger.debug( - Messages.QMAN_200020_ENTITY_DEFINITION_HAS_BEEN_BUILT, - _parent.getOwnerId(), - _parent.getName(), - _name); - } - - public String getName() - { - return _name; - } - - public String getPackageName() - { - return _parent.getName(); - } - - /** - * Internal method used to send a schema request for this entity. - * - * @throws Exception when the request cannot be sent. - */ - void requestSchema() throws Exception - { - - _objectName = JMX_SERVICE.createEntityDefinitionName(_parent.getName(), _name,_type); - JMX_SERVICE.registerEntityDefinition(_objectName,this,_parent.getName(),_name); - - try - { - _service.connect(); - _service.requestSchema(_parent.getName(), _name, _hash); - _service.sync(); - } finally - { - _service.close(); - } - - EntityLifecycleNotification notification = new EntityLifecycleNotification( - EntityLifecycleNotification.SCHEMA_REQUESTED_NOTIFICATION_TYPE, - _parent.getName(), - _name, - Names.CLASS, - _objectName); - sendNotification(notification); - } -} +package org.apache.qpid.management.domain.model; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + + +import java.util.HashMap; +import java.util.Map; + +import javax.management.Attribute; +import javax.management.AttributeList; +import javax.management.DynamicMBean; +import javax.management.MBeanInfo; +import javax.management.NotificationBroadcasterSupport; +import javax.management.ObjectName; +import javax.management.RuntimeOperationsException; + +import org.apache.qpid.management.Messages; +import org.apache.qpid.management.Names; +import org.apache.qpid.management.domain.model.type.Binary; +import org.apache.qpid.management.domain.services.QpidService; +import org.apache.qpid.management.jmx.EntityLifecycleNotification; +import org.apache.qpid.transport.util.Logger; + +/** + * Layer supertype for QMan entities. + */ +public abstract class QpidEntity extends NotificationBroadcasterSupport +{ + /** + * Layer supertype for QMan managed bean entities. + */ + abstract class QManManagedEntity implements DynamicMBean + { + // After mbean is registered with the MBean server this collection holds the mbean attribute values. + Map _attributes = new HashMap(); + + /** + * Creates or replace the given attribute. + * Note that this is not part of the management interface of this object instance and therefore will be accessible only + * from within this class. + * It is used to update directly the object attributes bypassing jmx interface. + * + * @param attributeName the name of the attribute. + * @param property newValue the new value of the attribute. + */ + void createOrReplaceAttributeValue(String attributeName, Object newValue) + { + _attributes.put(attributeName, newValue); + } + + /** + * Get the values of several attributes of the Dynamic MBean. + * + * @param attributes A list of the attributes to be retrieved. + * + * @return The list of attributes retrieved. + */ + public AttributeList getAttributes (String[] attributes) + { + if (attributes == null) + { + throw new RuntimeOperationsException(new IllegalArgumentException("Attributes array must not be null")); + } + + AttributeList result = new AttributeList(attributes.length); + for (int i = 0; i < attributes.length; i++) + { + String attributeName = attributes[i]; + try + { + result.add(new Attribute(attributeName,getAttribute(attributeName))); + } catch(Exception exception) + { + // Already logged. + } + } + return result; + } + + /** + * Returns metadata for this object instance. + */ + // Developer Note : note that this metadata is a member of the outer class definition : in that way we create + // that metadata only once and then it will be shared between all object instances (it's a readonly object) + public MBeanInfo getMBeanInfo () + { + return _metadata; + } + }; + + final Logger _logger = Logger.get(getClass()); + final static JmxService JMX_SERVICE = new JmxService(); + + final String _name; + final Binary _hash; + + final QpidPackage _parent; + MBeanInfo _metadata; + final QpidService _service; + + protected ObjectName _objectName; + + private final String _type; + + /** + * Builds a new class with the given name and package as parent. + * + * @param className the name of the class. + * @param hash the class schema hash. + * @param parentPackage the parent of this class. + */ + QpidEntity(String className, Binary hash, QpidPackage parentPackage,String type) + { + this._name = className; + this._parent = parentPackage; + this._hash = hash; + this._type = type; + this._service = new QpidService(_parent.getOwnerId()); + + _logger.debug( + Messages.QMAN_200020_ENTITY_DEFINITION_HAS_BEEN_BUILT, + _parent.getOwnerId(), + _parent.getName(), + _name); + } + + public String getName() + { + return _name; + } + + public String getPackageName() + { + return _parent.getName(); + } + + /** + * Internal method used to send a schema request for this entity. + * + * @throws Exception when the request cannot be sent. + */ + void requestSchema() throws Exception + { + + _objectName = JMX_SERVICE.createEntityDefinitionName(_parent.getName(), _name,_type); + JMX_SERVICE.registerEntityDefinition(_objectName,this,_parent.getName(),_name); + + try + { + _service.connect(); + _service.requestSchema(_parent.getName(), _name, _hash); + _service.sync(); + } finally + { + _service.close(); + } + + EntityLifecycleNotification notification = new EntityLifecycleNotification( + EntityLifecycleNotification.SCHEMA_REQUESTED_NOTIFICATION_TYPE, + _parent.getName(), + _name, + Names.CLASS, + _objectName); + sendNotification(notification); + } +} diff --git a/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/engine/WSDMAdapterEnvironment.java b/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/engine/WSDMAdapterEnvironment.java index b5d978e0e5..e4d0f25adc 100644 --- a/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/engine/WSDMAdapterEnvironment.java +++ b/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/engine/WSDMAdapterEnvironment.java @@ -1,97 +1,118 @@ -package org.apache.qpid.management.wsdm.muse.engine; - -import java.io.File; -import java.net.URI; - -import javax.servlet.ServletContext; - -import org.apache.muse.core.AbstractEnvironment; -import org.apache.muse.util.FileUtils; -import org.apache.muse.ws.addressing.EndpointReference; -import org.apache.qpid.management.Messages; -import org.apache.qpid.management.Names; -import org.apache.qpid.management.Protocol; -import org.apache.qpid.transport.util.Logger; - -/** - * QMan Adapter enviroment implementation. - * - * @author Andrea Gazzarini - */ -public class WSDMAdapterEnvironment extends AbstractEnvironment -{ - private final static Logger LOGGER = Logger.get(WSDMAdapterEnvironment.class); - private final File _realDirectory; - private final ServletContext _servletContext; - - /** - * Builds a new qman environment with the given application context. - * - * @param servletContext the application context. - */ - public WSDMAdapterEnvironment(ServletContext servletContext) - { - this._servletContext = servletContext; - String realDirectoryPath = servletContext.getRealPath(Names.WEB_APP_CLASSES_FOLDER); - - _realDirectory = (realDirectoryPath != null) - ? new File(realDirectoryPath) - : FileUtils.CURRENT_DIR; - - String defaultURI = getDefaultURIPrefix()+"adapter"; - setDefaultURI(defaultURI); - - LOGGER.info(Messages.QMAN_000029_DEFAULT_URI, defaultURI); - } - - /** - * Returns the endpoint created starting by this application default URI. - * - * @return the endpoint created starting by this application default URI. - */ - public EndpointReference getDeploymentEPR() - { - return new EndpointReference(URI.create(getDefaultURI())); - } - - /** - * Returns the application classes folder. - * - * @return the application classes folder. - */ - public File getRealDirectory() - { - return _realDirectory; - } - - /** - * Returns the default endpoint reference URI. - * - * @return the default endpoint reference URI. - */ - public String getDefaultURIPrefix() - { - return new StringBuilder() - .append("http://") - .append(System.getProperty( - Names.ADAPTER_HOST_PROPERTY_NAME, - Protocol.DEFAULT_QMAN_HOSTNAME)) - .append(":") - .append(System.getProperty( - Names.ADAPTER_PORT_PROPERTY_NAME, - String.valueOf(Protocol.DEFAULT_QMAN_PORT_NUMBER))) - .append(_servletContext.getContextPath()) - .append("/services/") - .toString(); - } - - /** - * Returns the context path name of QMan application. - * - * @return the context path name of QMan application. - */ - public String getContextPath() - { - return _servletContext.getContextPath(); - } -} \ No newline at end of file +package org.apache.qpid.management.wsdm.muse.engine; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + + +import java.io.File; +import java.net.URI; + +import javax.servlet.ServletContext; + +import org.apache.muse.core.AbstractEnvironment; +import org.apache.muse.util.FileUtils; +import org.apache.muse.ws.addressing.EndpointReference; +import org.apache.qpid.management.Messages; +import org.apache.qpid.management.Names; +import org.apache.qpid.management.Protocol; +import org.apache.qpid.transport.util.Logger; + +/** + * QMan Adapter enviroment implementation. + * + * @author Andrea Gazzarini + */ +public class WSDMAdapterEnvironment extends AbstractEnvironment +{ + private final static Logger LOGGER = Logger.get(WSDMAdapterEnvironment.class); + private final File _realDirectory; + private final ServletContext _servletContext; + + /** + * Builds a new qman environment with the given application context. + * + * @param servletContext the application context. + */ + public WSDMAdapterEnvironment(ServletContext servletContext) + { + this._servletContext = servletContext; + String realDirectoryPath = servletContext.getRealPath(Names.WEB_APP_CLASSES_FOLDER); + + _realDirectory = (realDirectoryPath != null) + ? new File(realDirectoryPath) + : FileUtils.CURRENT_DIR; + + String defaultURI = getDefaultURIPrefix()+"adapter"; + setDefaultURI(defaultURI); + + LOGGER.info(Messages.QMAN_000029_DEFAULT_URI, defaultURI); + } + + /** + * Returns the endpoint created starting by this application default URI. + * + * @return the endpoint created starting by this application default URI. + */ + public EndpointReference getDeploymentEPR() + { + return new EndpointReference(URI.create(getDefaultURI())); + } + + /** + * Returns the application classes folder. + * + * @return the application classes folder. + */ + public File getRealDirectory() + { + return _realDirectory; + } + + /** + * Returns the default endpoint reference URI. + * + * @return the default endpoint reference URI. + */ + public String getDefaultURIPrefix() + { + return new StringBuilder() + .append("http://") + .append(System.getProperty( + Names.ADAPTER_HOST_PROPERTY_NAME, + Protocol.DEFAULT_QMAN_HOSTNAME)) + .append(":") + .append(System.getProperty( + Names.ADAPTER_PORT_PROPERTY_NAME, + String.valueOf(Protocol.DEFAULT_QMAN_PORT_NUMBER))) + .append(_servletContext.getContextPath()) + .append("/services/") + .toString(); + } + + /** + * Returns the context path name of QMan application. + * + * @return the context path name of QMan application. + */ + public String getContextPath() + { + return _servletContext.getContextPath(); + } +} diff --git a/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/engine/WSDMAdapterIsolationLayer.java b/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/engine/WSDMAdapterIsolationLayer.java index 0ca19bc727..e9a74bf60c 100644 --- a/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/engine/WSDMAdapterIsolationLayer.java +++ b/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/engine/WSDMAdapterIsolationLayer.java @@ -1,36 +1,57 @@ -package org.apache.qpid.management.wsdm.muse.engine; - -import javax.servlet.ServletContext; - -import org.apache.muse.core.Environment; -import org.apache.muse.core.platform.mini.MiniIsolationLayer; - -/** - * QMan specific implementation of the Apache Muse isolation layer. - * If you are a Muse expert you were wondering why don't we use the muse default implementation... - * well, - * - * @author Andrea Gazzarini - */ -public class WSDMAdapterIsolationLayer extends MiniIsolationLayer -{ - /** - * Builds a new isolation layer with the given application context. - * - * @param initialContext the application context. - */ - public WSDMAdapterIsolationLayer(ServletContext initialContext) - { - super(null, initialContext); - } - - /** - * WSDMAdapterEnvironment factory method. - * - * @return the environment. - */ - protected Environment createEnvironment() - { - return new WSDMAdapterEnvironment(getInitialContext()); - } -} \ No newline at end of file +package org.apache.qpid.management.wsdm.muse.engine; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + + +import javax.servlet.ServletContext; + +import org.apache.muse.core.Environment; +import org.apache.muse.core.platform.mini.MiniIsolationLayer; + +/** + * QMan specific implementation of the Apache Muse isolation layer. + * If you are a Muse expert you were wondering why don't we use the muse default implementation... + * well, + * + * @author Andrea Gazzarini + */ +public class WSDMAdapterIsolationLayer extends MiniIsolationLayer +{ + /** + * Builds a new isolation layer with the given application context. + * + * @param initialContext the application context. + */ + public WSDMAdapterIsolationLayer(ServletContext initialContext) + { + super(null, initialContext); + } + + /** + * WSDMAdapterEnvironment factory method. + * + * @return the environment. + */ + protected Environment createEnvironment() + { + return new WSDMAdapterEnvironment(getInitialContext()); + } +} diff --git a/java/management/client/src/main/java/router-entries/adapter/resource-instance-1.xml b/java/management/client/src/main/java/router-entries/adapter/resource-instance-1.xml index f7d72c2903..062791fa3f 100644 --- a/java/management/client/src/main/java/router-entries/adapter/resource-instance-1.xml +++ b/java/management/client/src/main/java/router-entries/adapter/resource-instance-1.xml @@ -1,2 +1,23 @@ + + diff --git a/java/management/client/src/main/java/router-entries/consumer/resource-instance-1.xml b/java/management/client/src/main/java/router-entries/consumer/resource-instance-1.xml index 599ac87a57..062791fa3f 100644 --- a/java/management/client/src/main/java/router-entries/consumer/resource-instance-1.xml +++ b/java/management/client/src/main/java/router-entries/consumer/resource-instance-1.xml @@ -1,2 +1,23 @@ - - \ No newline at end of file + + + + diff --git a/java/management/client/src/main/java/wsdl/SOAP-Envelope-1_2.xsd b/java/management/client/src/main/java/wsdl/SOAP-Envelope-1_2.xsd index 5aba6591fe..ab38b1b7f2 100644 --- a/java/management/client/src/main/java/wsdl/SOAP-Envelope-1_2.xsd +++ b/java/management/client/src/main/java/wsdl/SOAP-Envelope-1_2.xsd @@ -1,160 +1,181 @@ - - - - - - - - - - - - - - - - - - - - - - - Elements replacing the wildcard MUST be namespace qualified, but can be in the targetNamespace - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Fault reporting structure - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + Elements replacing the wildcard MUST be namespace qualified, but can be in the targetNamespace + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Fault reporting structure + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/management/client/src/main/java/wsdl/WS-Addressing-2005_08.xsd b/java/management/client/src/main/java/wsdl/WS-Addressing-2005_08.xsd index 9bf9b10b7f..04b4a688b3 100644 --- a/java/management/client/src/main/java/wsdl/WS-Addressing-2005_08.xsd +++ b/java/management/client/src/main/java/wsdl/WS-Addressing-2005_08.xsd @@ -1,22 +1,43 @@ - + + - - - @@ -24,7 +45,7 @@ - @@ -33,7 +54,7 @@ - @@ -44,10 +65,10 @@ - - @@ -59,7 +80,7 @@ - @@ -73,7 +94,7 @@ - @@ -107,18 +128,18 @@ - - - @@ -127,7 +148,7 @@ - @@ -139,7 +160,7 @@ - diff --git a/java/management/client/src/main/java/wsdl/WS-MetadataExchange-2004_09.xsd b/java/management/client/src/main/java/wsdl/WS-MetadataExchange-2004_09.xsd index 771a801f57..4cef35b510 100644 --- a/java/management/client/src/main/java/wsdl/WS-MetadataExchange-2004_09.xsd +++ b/java/management/client/src/main/java/wsdl/WS-MetadataExchange-2004_09.xsd @@ -1,113 +1,134 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/management/client/src/main/java/wsdl/WSDM-MUWS-Part1-1_1.xsd b/java/management/client/src/main/java/wsdl/WSDM-MUWS-Part1-1_1.xsd index dd74c23681..c24e97a9ce 100644 --- a/java/management/client/src/main/java/wsdl/WSDM-MUWS-Part1-1_1.xsd +++ b/java/management/client/src/main/java/wsdl/WSDM-MUWS-Part1-1_1.xsd @@ -1,93 +1,114 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/management/client/src/main/java/wsdl/WSDM-MUWS-Part2-1_1.xsd b/java/management/client/src/main/java/wsdl/WSDM-MUWS-Part2-1_1.xsd index 51233a0989..5ea0954734 100644 --- a/java/management/client/src/main/java/wsdl/WSDM-MUWS-Part2-1_1.xsd +++ b/java/management/client/src/main/java/wsdl/WSDM-MUWS-Part2-1_1.xsd @@ -1,656 +1,677 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/management/client/src/main/java/wsdl/XML-Namespace-1998.xsd b/java/management/client/src/main/java/wsdl/XML-Namespace-1998.xsd index 998a8001de..f51b67f78f 100644 --- a/java/management/client/src/main/java/wsdl/XML-Namespace-1998.xsd +++ b/java/management/client/src/main/java/wsdl/XML-Namespace-1998.xsd @@ -1,25 +1,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/management/client/src/test/java/log4j.xml b/java/management/client/src/test/java/log4j.xml index 34634b7738..891e7908e2 100644 --- a/java/management/client/src/test/java/log4j.xml +++ b/java/management/client/src/test/java/log4j.xml @@ -1,4 +1,25 @@ + + @@ -11,15 +32,15 @@ value="%d{ABSOLUTE} %-5p [%c{1}] %m%n" /> - - - - - - - - - + + + + + + + + + @@ -29,4 +50,4 @@ - \ No newline at end of file + diff --git a/java/management/client/src/test/java/org/apache/qpid/management/wsdm/web.xml b/java/management/client/src/test/java/org/apache/qpid/management/wsdm/web.xml index d0a9eb20a4..df273bd841 100644 --- a/java/management/client/src/test/java/org/apache/qpid/management/wsdm/web.xml +++ b/java/management/client/src/test/java/org/apache/qpid/management/wsdm/web.xml @@ -1,4 +1,25 @@ + + @@ -8,4 +29,4 @@ org.apache.qpid.management.wsdm.QEmuInitializer 1 - \ No newline at end of file + diff --git a/java/management/client/web.xml b/java/management/client/web.xml index 29eb64a268..881fc82f46 100644 --- a/java/management/client/web.xml +++ b/java/management/client/web.xml @@ -1,4 +1,25 @@ + + @@ -125,4 +146,4 @@ BASIC - \ No newline at end of file + diff --git a/java/management/console/src/main/java/org/apache/qpid/console/XMLUtil.java b/java/management/console/src/main/java/org/apache/qpid/console/XMLUtil.java index 1ab93de6a2..dcbcb5b6b6 100644 --- a/java/management/console/src/main/java/org/apache/qpid/console/XMLUtil.java +++ b/java/management/console/src/main/java/org/apache/qpid/console/XMLUtil.java @@ -1,4 +1,25 @@ package org.apache.qpid.console; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + public class XMLUtil { diff --git a/java/perftests/bin/monitoring/monitor-broker.sh b/java/perftests/bin/monitoring/monitor-broker.sh index 39f4760114..27c8ff25f6 100755 --- a/java/perftests/bin/monitoring/monitor-broker.sh +++ b/java/perftests/bin/monitoring/monitor-broker.sh @@ -1,4 +1,25 @@ #!/bin/bash +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# + # # This script starts a broker and then starts additional logging as required. # *.pid files are generated in the LOG_DIR for later use by the stop-monitored-broker diff --git a/java/perftests/bin/monitoring/runTests.sh b/java/perftests/bin/monitoring/runTests.sh index 4ba5040ccc..676db0d4fa 100755 --- a/java/perftests/bin/monitoring/runTests.sh +++ b/java/perftests/bin/monitoring/runTests.sh @@ -1,4 +1,25 @@ #!/bin/bash +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# + # # Run specified performance tests and # gather details about the test run diff --git a/java/perftests/bin/monitoring/stop-monitored-broker.sh b/java/perftests/bin/monitoring/stop-monitored-broker.sh index 2bd1d1771a..ad882b0bea 100755 --- a/java/perftests/bin/monitoring/stop-monitored-broker.sh +++ b/java/perftests/bin/monitoring/stop-monitored-broker.sh @@ -1,4 +1,25 @@ #!/bin/bash +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# + # # Script to stop the running of a monitored broker # and the associated monitoring processes. diff --git a/java/perftests/bin/processing/process.sh b/java/perftests/bin/processing/process.sh index 84d6467f87..cb2181622c 100755 --- a/java/perftests/bin/processing/process.sh +++ b/java/perftests/bin/processing/process.sh @@ -1,4 +1,25 @@ #!/bin/bash +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# + usage() { diff --git a/java/perftests/bin/processing/processAll.sh b/java/perftests/bin/processing/processAll.sh index 7fce0abb60..da92107ce0 100755 --- a/java/perftests/bin/processing/processAll.sh +++ b/java/perftests/bin/processing/processAll.sh @@ -1,4 +1,25 @@ #!/bin/bash +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# + usage() { diff --git a/java/perftests/etc/scripts/extractResults.sh b/java/perftests/etc/scripts/extractResults.sh index 95aff9edba..4fc74059af 100755 --- a/java/perftests/etc/scripts/extractResults.sh +++ b/java/perftests/etc/scripts/extractResults.sh @@ -1,4 +1,25 @@ #!/bin/bash +x +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# + # # Process a given directory (defaults to '.') and provide a list of the tests run so # identification of any failures can be seen. diff --git a/java/perftests/etc/scripts/extractThroughputResults.sh b/java/perftests/etc/scripts/extractThroughputResults.sh index e85286ea3e..14236c68bc 100755 --- a/java/perftests/etc/scripts/extractThroughputResults.sh +++ b/java/perftests/etc/scripts/extractThroughputResults.sh @@ -1,4 +1,25 @@ #!/bin/bash +x +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# + # # Process a given directory (defaults to '.') and provides the throughput results as # reported by the tests. diff --git a/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml b/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml index 67e0702c41..4e32d21849 100644 --- a/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml +++ b/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml @@ -1,4 +1,25 @@ + + ${QPID_WORK} ${QPID_HOME}/etc diff --git a/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java b/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java index 8265b75201..96ce744075 100644 --- a/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java +++ b/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java @@ -1,4 +1,25 @@ package org.apache.qpid.client.message; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import java.util.Collections; import java.util.HashMap; diff --git a/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java b/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java index cbdb310179..5e387be91b 100644 --- a/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java +++ b/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java @@ -1,4 +1,25 @@ package org.apache.qpid.server.security.firewall; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import java.io.File; import java.io.FileWriter; diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java index 5352bf2bf0..aeddfd00fe 100644 --- a/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java +++ b/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java @@ -1,4 +1,25 @@ package org.apache.qpid.test.client.destination; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + import javax.jms.Connection; import javax.jms.JMSException; diff --git a/java/testkit/src/main/java/org/apache/qpid/testkit/ErrorHandler.java b/java/testkit/src/main/java/org/apache/qpid/testkit/ErrorHandler.java index a1add8e03f..dbc73c404f 100644 --- a/java/testkit/src/main/java/org/apache/qpid/testkit/ErrorHandler.java +++ b/java/testkit/src/main/java/org/apache/qpid/testkit/ErrorHandler.java @@ -1,4 +1,25 @@ package org.apache.qpid.testkit; +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + public interface ErrorHandler { -- cgit v1.2.1