diff options
| author | Rajith Muditha Attapattu <rajith@apache.org> | 2010-02-12 04:38:52 +0000 |
|---|---|---|
| committer | Rajith Muditha Attapattu <rajith@apache.org> | 2010-02-12 04:38:52 +0000 |
| commit | bd615b54090b57ce596156c8c84e8ca81124e1ee (patch) | |
| tree | 8217a9886c2700cd00b6678abfcf8c0a338cdef5 | |
| parent | 09f2cb481e171a5004037ce99d8576dca406d5e5 (diff) | |
| download | qpid-python-bd615b54090b57ce596156c8c84e8ca81124e1ee.tar.gz | |
This commit is related to QPID-2404
I have added the license headers the files
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.6-release@909229 13f79535-47bb-0310-9956-ffa450edef68
76 files changed, 4834 insertions, 3079 deletions
diff --git a/qpid/cpp/examples/README.verify b/qpid/cpp/examples/README.verify index d15adce58d..9b6f6470c0 100644 --- a/qpid/cpp/examples/README.verify +++ b/qpid/cpp/examples/README.verify @@ -1,3 +1,22 @@ +# +# 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. +# + = Qpid C++ Examples = For more information read examples/README. diff --git a/qpid/cpp/src/qpid/framing/Blob.h b/qpid/cpp/src/qpid/framing/Blob.h index e69de29bb2..9878d92fe4 100644 --- a/qpid/cpp/src/qpid/framing/Blob.h +++ b/qpid/cpp/src/qpid/framing/Blob.h @@ -0,0 +1,21 @@ +/* + * + * 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. + * + */ + diff --git a/qpid/cpp/src/qpid/framing/BodyHolder.cpp b/qpid/cpp/src/qpid/framing/BodyHolder.cpp index e69de29bb2..9878d92fe4 100644 --- a/qpid/cpp/src/qpid/framing/BodyHolder.cpp +++ b/qpid/cpp/src/qpid/framing/BodyHolder.cpp @@ -0,0 +1,21 @@ +/* + * + * 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. + * + */ + diff --git a/qpid/cpp/src/qpid/framing/BodyHolder.h b/qpid/cpp/src/qpid/framing/BodyHolder.h index e69de29bb2..9878d92fe4 100644 --- a/qpid/cpp/src/qpid/framing/BodyHolder.h +++ b/qpid/cpp/src/qpid/framing/BodyHolder.h @@ -0,0 +1,21 @@ +/* + * + * 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. + * + */ + diff --git a/qpid/cpp/src/tests/Blob.cpp b/qpid/cpp/src/tests/Blob.cpp index e69de29bb2..9878d92fe4 100644 --- a/qpid/cpp/src/tests/Blob.cpp +++ b/qpid/cpp/src/tests/Blob.cpp @@ -0,0 +1,21 @@ +/* + * + * 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. + * + */ + diff --git a/qpid/cpp/src/tests/cluster_python_tests b/qpid/cpp/src/tests/cluster_python_tests index 1a3fa4aff8..8d859ce027 100755 --- a/qpid/cpp/src/tests/cluster_python_tests +++ b/qpid/cpp/src/tests/cluster_python_tests @@ -1,4 +1,24 @@ #!/bin/sh + +# +# 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. +# + # FAILING=`dirname $0`/cluster_python_tests_failing.txt source `dirname $0`/python_tests diff --git a/qpid/cpp/src/tests/cluster_test_scripts/cluster_check b/qpid/cpp/src/tests/cluster_test_scripts/cluster_check index 5cc872a921..05fcc1bcd2 100755 --- a/qpid/cpp/src/tests/cluster_test_scripts/cluster_check +++ b/qpid/cpp/src/tests/cluster_test_scripts/cluster_check @@ -1,4 +1,24 @@ #!/bin/sh + +# +# 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. +# + # Check that all members of a cluster are running source config.sh diff --git a/qpid/cpp/src/tests/cluster_test_scripts/cluster_start b/qpid/cpp/src/tests/cluster_test_scripts/cluster_start index bde582ef2b..8911358f7e 100755 --- a/qpid/cpp/src/tests/cluster_test_scripts/cluster_start +++ b/qpid/cpp/src/tests/cluster_test_scripts/cluster_start @@ -1,4 +1,24 @@ #!/bin/sh + +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + # Start a cluster # # Arguments: NAME HOST [host...] diff --git a/qpid/cpp/src/tests/cluster_test_scripts/cluster_stop b/qpid/cpp/src/tests/cluster_test_scripts/cluster_stop index d4543d2d4a..09aa8f3b21 100755 --- a/qpid/cpp/src/tests/cluster_test_scripts/cluster_stop +++ b/qpid/cpp/src/tests/cluster_test_scripts/cluster_stop @@ -1,4 +1,24 @@ #!/bin/sh + +# +# 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. +# + # Stop the cluster. source config.sh diff --git a/qpid/cpp/src/tests/cluster_test_scripts/config_example.sh b/qpid/cpp/src/tests/cluster_test_scripts/config_example.sh index fd5b800df7..d47c9a9c77 100755 --- a/qpid/cpp/src/tests/cluster_test_scripts/config_example.sh +++ b/qpid/cpp/src/tests/cluster_test_scripts/config_example.sh @@ -1,5 +1,24 @@ # Cluster 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. +# + # All output stored under $HOME/$CLUSTER_HOME. CLUSTER_HOME=$HOME/cluster_test diff --git a/qpid/cpp/src/tests/cluster_test_scripts/perftest b/qpid/cpp/src/tests/cluster_test_scripts/perftest index 72c8268835..984761eb5f 100755 --- a/qpid/cpp/src/tests/cluster_test_scripts/perftest +++ b/qpid/cpp/src/tests/cluster_test_scripts/perftest @@ -1,4 +1,24 @@ #!/bin/sh + +# +# 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 a distributed perftest against a cluster. # Args: npubs nsubs [perftest-options] diff --git a/qpid/dotnet/client-010/client/client/IClientSession.cs b/qpid/dotnet/client-010/client/client/IClientSession.cs index b8bc7e4db8..8667db1fb4 100644 --- a/qpid/dotnet/client-010/client/client/IClientSession.cs +++ b/qpid/dotnet/client-010/client/client/IClientSession.cs @@ -1,3 +1,24 @@ +/* + * + * 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. + * + */ + using System; using System.Collections.Generic; using org.apache.qpid.transport; diff --git a/qpid/dotnet/client-010/client/transport/ISession.cs b/qpid/dotnet/client-010/client/transport/ISession.cs index 257b42b455..e843095df6 100644 --- a/qpid/dotnet/client-010/client/transport/ISession.cs +++ b/qpid/dotnet/client-010/client/transport/ISession.cs @@ -1,3 +1,24 @@ +/* + * + * 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. + * + */ + using System; using System.Collections.Generic; diff --git a/qpid/dotnet/client-010/demo/Properties/Resources.Designer.cs b/qpid/dotnet/client-010/demo/Properties/Resources.Designer.cs index 761056a770..912f9e5b81 100644 --- a/qpid/dotnet/client-010/demo/Properties/Resources.Designer.cs +++ b/qpid/dotnet/client-010/demo/Properties/Resources.Designer.cs @@ -1,3 +1,24 @@ +/* + * + * 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. + * + */ + //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. diff --git a/qpid/dotnet/client-010/demo/Properties/Settings.Designer.cs b/qpid/dotnet/client-010/demo/Properties/Settings.Designer.cs index 6bf34e7ce0..fc41e577fe 100644 --- a/qpid/dotnet/client-010/demo/Properties/Settings.Designer.cs +++ b/qpid/dotnet/client-010/demo/Properties/Settings.Designer.cs @@ -1,3 +1,24 @@ +/* + * + * 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. + * + */ + //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. diff --git a/qpid/dotnet/client-010/management/console/XMLUtil.cs b/qpid/dotnet/client-010/management/console/XMLUtil.cs index 255b9c4dd1..b24ad51747 100644 --- a/qpid/dotnet/client-010/management/console/XMLUtil.cs +++ b/qpid/dotnet/client-010/management/console/XMLUtil.cs @@ -1,3 +1,24 @@ +/* + * + * 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. + * + */ + using System; using System.Collections.Generic; diff --git a/qpid/dotnet/client-010/test/Helpers/ConfigHelpers.cs b/qpid/dotnet/client-010/test/Helpers/ConfigHelpers.cs index 92374b5c41..883e52c264 100644 --- a/qpid/dotnet/client-010/test/Helpers/ConfigHelpers.cs +++ b/qpid/dotnet/client-010/test/Helpers/ConfigHelpers.cs @@ -1,3 +1,24 @@ +/* + * + * 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. + * + */ + using System; using System.Collections.Generic; using System.IO; diff --git a/qpid/dotnet/client-010/test/interop/ConnectionTests.cs b/qpid/dotnet/client-010/test/interop/ConnectionTests.cs index 0c2ea8a648..37fd0e7933 100644 --- a/qpid/dotnet/client-010/test/interop/ConnectionTests.cs +++ b/qpid/dotnet/client-010/test/interop/ConnectionTests.cs @@ -1,3 +1,24 @@ +/* + * + * 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. + * + */ + using System; using System.Net.Sockets; using NUnit.Framework; diff --git a/qpid/java/broker/scripts/resetAlerting.sh b/qpid/java/broker/scripts/resetAlerting.sh index 57a38f3ed1..e96e921bbc 100644 --- a/qpid/java/broker/scripts/resetAlerting.sh +++ b/qpid/java/broker/scripts/resetAlerting.sh @@ -1,5 +1,47 @@ +# +# +# 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. +# +# + #!/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. # # Defaults to Localhost broker diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngineFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngineFactory.java index ff0c007a60..0e4444725e 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngineFactory.java +++ b/qpid/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/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java index 547365f647..1309e05978 100755 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java +++ b/qpid/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/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/AuthorizationManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/AuthorizationManager.java index 9527120f30..895ed52222 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/AuthorizationManager.java +++ b/qpid/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/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java index 9997fbe767..b231ce87a4 100755 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java +++ b/qpid/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/qpid/java/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java index b4774113be..f81f482c6a 100644 --- a/qpid/java/client/src/test/java/org/apache/qpid/client/message/AbstractJMSMessageTest.java +++ b/qpid/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/qpid/java/common/src/main/java/org/apache/qpid/thread/DefaultThreadFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/thread/DefaultThreadFactory.java index 94869ab205..638999399b 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/thread/DefaultThreadFactory.java +++ b/qpid/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/qpid/java/common/src/main/java/org/apache/qpid/thread/RealtimeThreadFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/thread/RealtimeThreadFactory.java index b711f749f8..0507b3108f 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/thread/RealtimeThreadFactory.java +++ b/qpid/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/qpid/java/common/src/main/java/org/apache/qpid/thread/ThreadFactory.java b/qpid/java/common/src/main/java/org/apache/qpid/thread/ThreadFactory.java index f9bcabfa3d..4b8937acbd 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/thread/ThreadFactory.java +++ b/qpid/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/qpid/java/common/src/main/java/org/apache/qpid/thread/Threading.java b/qpid/java/common/src/main/java/org/apache/qpid/thread/Threading.java index 0fb113d22c..603e8a7441 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/thread/Threading.java +++ b/qpid/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/qpid/java/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java b/qpid/java/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java index 46c812e265..62e25e7d79 100644 --- a/qpid/java/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java +++ b/qpid/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/qpid/java/common/src/test/java/org/apache/qpid/codec/MockAMQVersionAwareProtocolSession.java b/qpid/java/common/src/test/java/org/apache/qpid/codec/MockAMQVersionAwareProtocolSession.java index c3b91d5d18..401848c21d 100644 --- a/qpid/java/common/src/test/java/org/apache/qpid/codec/MockAMQVersionAwareProtocolSession.java +++ b/qpid/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/qpid/java/common/src/test/java/org/apache/qpid/thread/ThreadFactoryTest.java b/qpid/java/common/src/test/java/org/apache/qpid/thread/ThreadFactoryTest.java index 9932633cb9..7f17592893 100644 --- a/qpid/java/common/src/test/java/org/apache/qpid/thread/ThreadFactoryTest.java +++ b/qpid/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/qpid/java/etc/code-style.xml b/qpid/java/etc/code-style.xml index a52b2a0c74..298275fd58 100644 --- a/qpid/java/etc/code-style.xml +++ b/qpid/java/etc/code-style.xml @@ -1,4 +1,25 @@ <?xml version="1.0"?> +<!-- + + 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. + +--> + <profiles version="10"> <profile name="mine" version="10"> <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/> @@ -248,4 +269,4 @@ <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/> <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/> </profile> -</profiles>
\ No newline at end of file +</profiles> diff --git a/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/EventSeverity.java b/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/EventSeverity.java index a3528d9804..28735286c4 100644 --- a/qpid/java/management/agent/src/main/java/org/apache/qpid/agent/EventSeverity.java +++ b/qpid/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/qpid/java/management/client/console/brokers_management.jsp b/qpid/java/management/client/console/brokers_management.jsp index 449eabfcc1..f307006ac1 100644 --- a/qpid/java/management/client/console/brokers_management.jsp +++ b/qpid/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"%>
-<html>
- <head>
- <link rel="stylesheet" href="<%=request.getContextPath()%>/images/style.css" type="text/css" />
- <title>QMan Administration Console</title>
- </head>
- <body>
- <div id="page" align="center">
- <jsp:include page="/fragments/header.jsp">
- <jsp:param name="title" value="Brokers Management"/>
- </jsp:include>
-
- <div id="content" align="center">
- <jsp:include page="/fragments/menu.jsp"/>
-
- <div id="contenttext">
- <div class="panel" align="justify">
- <span class="bodytext">
- <table width="100%">
- <tr>
- <td valign="top">
- <fieldset>
- <legend>Connected Brokers</legend>
- <table width="100%" cellspacing="1">
- <tr>
- <th nowrap="nowrap" align="center">Host</th>
- <th nowrap="nowrap" align="center" >Port</th>
- <th nowrap="nowrap" align="center">Virtual Host</th>
- <th nowrap="nowrap" align="center">Username</th>
- <th nowrap="nowrap" align="center">Initial Pool Capacity</th>
- <th nowrap="nowrap" align="center">Max Pool Capacity</th>
- <th nowrap="nowrap" align="center">Max Wait Timeout</th>
- </tr>
- <c:forEach var="broker" items="${model}" varStatus="rowCounter">
- <c:choose>
- <c:when test="${rowCounter.count % 2 == 0}">
- <c:set var="bgcolor" scope="page" value="EAEAEA"/>
- </c:when>
- <c:otherwise>
- <c:set var="bgcolor" scope="page" value="FFFFFF"/>
- </c:otherwise>
- </c:choose>
- <tr>
- <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${broker.host}"/></td>
- <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${broker.port}"/></td>
- <td style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${broker.virtualHost}"/></td>
- <td style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${broker.username}"/></td>
- <td style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${broker.initialPoolCapacity}"/></td>
- <td style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${broker.maxPoolCapacity}"/></td>
- <td style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${broker.maxWaitTimeout}"/></td>
- </tr>
- </c:forEach>
- </table>
- </fieldset>
- </td>
- </tr>
- <tr>
- <td>
- <form name="form" action="<%=request.getContextPath()%>/brokers_management" method="post">
- <fieldset>
- <legend>New Broker Connection Data</legend>
- <table>
- <tr>
- <td>
- Host :
- </td>
- <td>
- <input type="text" name="host"/>
- </td>
- <td style="font-size: x-small;">
- The hostname where the broker is running.
- </td>
- </tr>
- <tr>
- <td>
- Port :
- </td>
- <td>
- <input type="text" name="port"/>
- </td>
- <td style="font-size: x-small;">
- The port number where the broker is running.
- </td>
- </tr>
- <tr>
- <td>
- Virtual Host :
- </td>
- <td>
- <input type="text" name="virtualHost"/>
- </td>
- <td style="font-size: x-small;">
- The virtual host name.
- </td>
- </tr>
- <tr>
- <td>
- Username :
- </td>
- <td>
- <input type="text" name="username"/>
- </td>
- <td style="font-size: x-small;">
- The username used for estabilish connection with broker.
- </td>
- </tr>
- <tr>
- <td>
- Password :
- </td>
- <td>
- <input type="text" name="password"/>
- </td>
- <td style="font-size: x-small;">
- The password used for estabilish connection with broker.
- </td>
- </tr>
- <tr>
- <td>
- Initial Pool Capacity :
- </td>
- <td>
- <input type="text" name="initialCapacity"/>
- </td>
- <td style="font-size: x-small;">
- The number of connections that must be immediately opened.
- </td>
- </tr>
- <tr>
- <td>
- Max Pool Capacity :
- </td>
- <td>
- <input type="text" name="maxCapacity"/>
- </td>
- <td style="font-size: x-small;">
- The maximum number of open connections.
- </td>
- </tr>
- <tr>
- <td>
- Max Wait Timeout :
- </td>
- <td>
- <input type="text" name="maxWaitTimeout"/>
- </td>
- <td style="font-size: x-small;">
- The maximum amount of time that a client will wait for obtaining a connection.
- </td>
- </tr>
- <tr>
- <td colspan="3" align="center">
- <input type="submit" value="Connect"/>
- </td>
- </tr>
- </table>
- </fieldset>
- </td>
- </form>
- </tr>
- <tr>
- <td nowrap style="font-size: x-small; font-weight: bold; color=red;">
- <ul>
- <c:forEach var="errorMessage" items="${errors}">
- <li><span style="font-size: medium; font-weight: bold; color:red;">${errorMessage}</span></li>
- </c:forEach>
- </ul>
- </td>
- </tr>
-
- </table>
- </span>
- </div>
- </div>
- </div>
- </div>
- </body>
-</html>
\ 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. + +--> + +<%@ 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"%> +<html> + <head> + <link rel="stylesheet" href="<%=request.getContextPath()%>/images/style.css" type="text/css" /> + <title>QMan Administration Console</title> + </head> + <body> + <div id="page" align="center"> + <jsp:include page="/fragments/header.jsp"> + <jsp:param name="title" value="Brokers Management"/> + </jsp:include> + + <div id="content" align="center"> + <jsp:include page="/fragments/menu.jsp"/> + + <div id="contenttext"> + <div class="panel" align="justify"> + <span class="bodytext"> + <table width="100%"> + <tr> + <td valign="top"> + <fieldset> + <legend>Connected Brokers</legend> + <table width="100%" cellspacing="1"> + <tr> + <th nowrap="nowrap" align="center">Host</th> + <th nowrap="nowrap" align="center" >Port</th> + <th nowrap="nowrap" align="center">Virtual Host</th> + <th nowrap="nowrap" align="center">Username</th> + <th nowrap="nowrap" align="center">Initial Pool Capacity</th> + <th nowrap="nowrap" align="center">Max Pool Capacity</th> + <th nowrap="nowrap" align="center">Max Wait Timeout</th> + </tr> + <c:forEach var="broker" items="${model}" varStatus="rowCounter"> + <c:choose> + <c:when test="${rowCounter.count % 2 == 0}"> + <c:set var="bgcolor" scope="page" value="EAEAEA"/> + </c:when> + <c:otherwise> + <c:set var="bgcolor" scope="page" value="FFFFFF"/> + </c:otherwise> + </c:choose> + <tr> + <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${broker.host}"/></td> + <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${broker.port}"/></td> + <td style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${broker.virtualHost}"/></td> + <td style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${broker.username}"/></td> + <td style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${broker.initialPoolCapacity}"/></td> + <td style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${broker.maxPoolCapacity}"/></td> + <td style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${broker.maxWaitTimeout}"/></td> + </tr> + </c:forEach> + </table> + </fieldset> + </td> + </tr> + <tr> + <td> + <form name="form" action="<%=request.getContextPath()%>/brokers_management" method="post"> + <fieldset> + <legend>New Broker Connection Data</legend> + <table> + <tr> + <td> + Host : + </td> + <td> + <input type="text" name="host"/> + </td> + <td style="font-size: x-small;"> + The hostname where the broker is running. + </td> + </tr> + <tr> + <td> + Port : + </td> + <td> + <input type="text" name="port"/> + </td> + <td style="font-size: x-small;"> + The port number where the broker is running. + </td> + </tr> + <tr> + <td> + Virtual Host : + </td> + <td> + <input type="text" name="virtualHost"/> + </td> + <td style="font-size: x-small;"> + The virtual host name. + </td> + </tr> + <tr> + <td> + Username : + </td> + <td> + <input type="text" name="username"/> + </td> + <td style="font-size: x-small;"> + The username used for estabilish connection with broker. + </td> + </tr> + <tr> + <td> + Password : + </td> + <td> + <input type="text" name="password"/> + </td> + <td style="font-size: x-small;"> + The password used for estabilish connection with broker. + </td> + </tr> + <tr> + <td> + Initial Pool Capacity : + </td> + <td> + <input type="text" name="initialCapacity"/> + </td> + <td style="font-size: x-small;"> + The number of connections that must be immediately opened. + </td> + </tr> + <tr> + <td> + Max Pool Capacity : + </td> + <td> + <input type="text" name="maxCapacity"/> + </td> + <td style="font-size: x-small;"> + The maximum number of open connections. + </td> + </tr> + <tr> + <td> + Max Wait Timeout : + </td> + <td> + <input type="text" name="maxWaitTimeout"/> + </td> + <td style="font-size: x-small;"> + The maximum amount of time that a client will wait for obtaining a connection. + </td> + </tr> + <tr> + <td colspan="3" align="center"> + <input type="submit" value="Connect"/> + </td> + </tr> + </table> + </fieldset> + </td> + </form> + </tr> + <tr> + <td nowrap style="font-size: x-small; font-weight: bold; color=red;"> + <ul> + <c:forEach var="errorMessage" items="${errors}"> + <li><span style="font-size: medium; font-weight: bold; color:red;">${errorMessage}</span></li> + </c:forEach> + </ul> + </td> + </tr> + + </table> + </span> + </div> + </div> + </div> + </div> + </body> +</html> diff --git a/qpid/java/management/client/console/console.jsp b/qpid/java/management/client/console/console.jsp index cdb53fede9..d1a207fe32 100644 --- a/qpid/java/management/client/console/console.jsp +++ b/qpid/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'%>
-<html>
- <head>
- <link rel="stylesheet" href="<%=request.getContextPath()%>/images/style.css" type="text/css" />
- <title>QMan Administration Console</title>
- </head>
- <body>
- <div id="page" align="center">
- <jsp:include page="/fragments/header.jsp">
- <jsp:param name="title" value="System Overview"/>
- </jsp:include>
-
- <div id="content" align="center">
- <jsp:include page="/fragments/menu.jsp"/>
-
- <div id="contenttext">
- <div class="panel" align="justify" style="height:500px; overflow-y:auto;">
- <span class="bodytext">
- <table width="100%" border="0">
- <tr>
- <td valign="top" nowrap align="center">
- <fieldset>
- <legend>QMan</legend>
- <table cellspacing="2">
- <tr><td style="color: #006633; font-size: xx-small; font-weight:bold;" align="center">Version</td></tr>
- <tr><td style="font-size: xx-small;" align="center">${requestScope.model.version}</td></tr>
- <tr><td><br /></td></tr>
- <tr><td style="color: #006633; font-size: xx-small; font-weight:bold" align="center">Version Name</td></tr>
- <tr><td style="font-size: xx-small;" align="center">${requestScope.model.versionName}</td></tr>
- <tr><td><br /></td></tr>
- <tr><td style="color: #006633; font-size: xx-small; font-weight:bold" align="center">Start Date</td></tr>
- <tr>
- <td style="font-size: xx-small;" align="center">
- <fmt:formatDate
- value="${requestScope.model.startDate}"
- pattern="MM/dd/yyyy hh:mm:ss"/>
- </td>
- </tr>
- <tr><td><br /></td></tr>
- <tr><td style="color: #006633; font-size: xx-small; font-weight:bold" align="center">Host</td></tr>
- <tr><td style="font-size: xx-small;" align="center">${requestScope.model.host}</td></tr>
- <tr><td><br /></td></tr>
- <tr><td style="color: #006633; font-size: xx-small; font-weight:bold" align="center">Port</td></tr>
- <tr><td style="font-size: xx-small;" align="center">${requestScope.model.port}</td></tr>
- </table>
- </fieldset>
- <fieldset>
- <legend>Operating System</legend>
- <table cellspacing="2">
- <tr><td style="color: #006633; font-size: xx-small; font-weight:bold;" align="center">Name</td></tr>
- <tr><td style="font-size: xx-small;" align="center">${requestScope.model.osName}</td></tr>
- <tr><td><br /></td></tr>
- <tr><td style="color: #006633; font-size: xx-small; font-weight:bold" align="center">Version</td></tr>
- <tr><td style="font-size: xx-small;" align="center">${requestScope.model.osVersion}</td></tr>
- <tr><td><br /></td></tr>
- <tr><td style="color: #006633; font-size: xx-small; font-weight:bold" align="center">Arch</td></tr>
- <tr><td style="font-size: xx-small;" align="center">${requestScope.model.archName}</td></tr>
- <tr><td><br /></td></tr>
- <tr><td style="color: #006633; font-size: xx-small; font-weight:bold" align="center">Processors</td></tr>
- <tr><td style="font-size: xx-small;" align="center">${requestScope.model.processors}</td></tr>
- </table>
- </fieldset>
- </td>
- <td valign="top">
- <fieldset>
- <legend>JVM Environment</legend>
- <table cellspacing="5">
- <tr>
- <td valign="top">
- <h4 style="color: #006633; font-size: xx-small">Boot Classpath :
- <p/>
- <c:forEach var="entry" items="${model.bootClasspath}">
- <c:out value="${entry}"/>;
- <br/>
- </c:forEach>
- </h4>
- </td>
- <td valign="top">
- <h4 style="color: #006633; font-size: xx-small">
- Input Arguments :
- <p/>
- <c:forEach var="argument" items="${model.inputArguments}">
- <c:out value="${argument}"/>;
- <br/>
- </c:forEach>
- </h4>
- </td>
- </tr>
- </table>
- </fieldset>
- </td>
- </tr>
- </table>
- </span>
- </div>
- </div>
- </div>
- </div>
- </body>
-</html>
\ 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. + +--> + +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> +<html> + <head> + <link rel="stylesheet" href="<%=request.getContextPath()%>/images/style.css" type="text/css" /> + <title>QMan Administration Console</title> + </head> + <body> + <div id="page" align="center"> + <jsp:include page="/fragments/header.jsp"> + <jsp:param name="title" value="System Overview"/> + </jsp:include> + + <div id="content" align="center"> + <jsp:include page="/fragments/menu.jsp"/> + + <div id="contenttext"> + <div class="panel" align="justify" style="height:500px; overflow-y:auto;"> + <span class="bodytext"> + <table width="100%" border="0"> + <tr> + <td valign="top" nowrap align="center"> + <fieldset> + <legend>QMan</legend> + <table cellspacing="2"> + <tr><td style="color: #006633; font-size: xx-small; font-weight:bold;" align="center">Version</td></tr> + <tr><td style="font-size: xx-small;" align="center">${requestScope.model.version}</td></tr> + <tr><td><br /></td></tr> + <tr><td style="color: #006633; font-size: xx-small; font-weight:bold" align="center">Version Name</td></tr> + <tr><td style="font-size: xx-small;" align="center">${requestScope.model.versionName}</td></tr> + <tr><td><br /></td></tr> + <tr><td style="color: #006633; font-size: xx-small; font-weight:bold" align="center">Start Date</td></tr> + <tr> + <td style="font-size: xx-small;" align="center"> + <fmt:formatDate + value="${requestScope.model.startDate}" + pattern="MM/dd/yyyy hh:mm:ss"/> + </td> + </tr> + <tr><td><br /></td></tr> + <tr><td style="color: #006633; font-size: xx-small; font-weight:bold" align="center">Host</td></tr> + <tr><td style="font-size: xx-small;" align="center">${requestScope.model.host}</td></tr> + <tr><td><br /></td></tr> + <tr><td style="color: #006633; font-size: xx-small; font-weight:bold" align="center">Port</td></tr> + <tr><td style="font-size: xx-small;" align="center">${requestScope.model.port}</td></tr> + </table> + </fieldset> + <fieldset> + <legend>Operating System</legend> + <table cellspacing="2"> + <tr><td style="color: #006633; font-size: xx-small; font-weight:bold;" align="center">Name</td></tr> + <tr><td style="font-size: xx-small;" align="center">${requestScope.model.osName}</td></tr> + <tr><td><br /></td></tr> + <tr><td style="color: #006633; font-size: xx-small; font-weight:bold" align="center">Version</td></tr> + <tr><td style="font-size: xx-small;" align="center">${requestScope.model.osVersion}</td></tr> + <tr><td><br /></td></tr> + <tr><td style="color: #006633; font-size: xx-small; font-weight:bold" align="center">Arch</td></tr> + <tr><td style="font-size: xx-small;" align="center">${requestScope.model.archName}</td></tr> + <tr><td><br /></td></tr> + <tr><td style="color: #006633; font-size: xx-small; font-weight:bold" align="center">Processors</td></tr> + <tr><td style="font-size: xx-small;" align="center">${requestScope.model.processors}</td></tr> + </table> + </fieldset> + </td> + <td valign="top"> + <fieldset> + <legend>JVM Environment</legend> + <table cellspacing="5"> + <tr> + <td valign="top"> + <h4 style="color: #006633; font-size: xx-small">Boot Classpath : + <p/> + <c:forEach var="entry" items="${model.bootClasspath}"> + <c:out value="${entry}"/>; + <br/> + </c:forEach> + </h4> + </td> + <td valign="top"> + <h4 style="color: #006633; font-size: xx-small"> + Input Arguments : + <p/> + <c:forEach var="argument" items="${model.inputArguments}"> + <c:out value="${argument}"/>; + <br/> + </c:forEach> + </h4> + </td> + </tr> + </table> + </fieldset> + </td> + </tr> + </table> + </span> + </div> + </div> + </div> + </div> + </body> +</html> diff --git a/qpid/java/management/client/console/error_page.jsp b/qpid/java/management/client/console/error_page.jsp index a0fd1e3629..73d2f9edc3 100644 --- a/qpid/java/management/client/console/error_page.jsp +++ b/qpid/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'%>
-<html>
- <head>
- <link rel="stylesheet" href="<%=request.getContextPath()%>/images/style.css" type="text/css" />
- <title>QMan Administration Console</title>
- </head>
- <body>
- <div id="page" align="center">
- <jsp:include page="/fragments/header.jsp">
- <jsp:param name="title" value="Error Page"/>
- </jsp:include>
-
- <div id="content" align="center">
- <jsp:include page="/fragments/menu.jsp"/>
-
- <div id="contenttext">
- <div class="panel" align="justify" style="height:500px; overflow-y:auto;">
- <span class="bodytext">
- <table width="100%">
- <tr><td nowrap style="font-weight: bold;">
- We are not able to satify your request because an error has happened.
- <br>Message : ${errorMessage}
- </td></tr>
- <tr><td nowrap style="font-size: xx-small; font-weight: bold;">
- <c:forEach var="stackTrace" items="${exception.stackTrace}">
- ${stackTrace}
- <br>
- </c:forEach>
- </td></tr>
- </table>
- </span>
- </div>
- </div>
- </div>
- </div>
- </body>
-</html>
\ 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. + +--> + +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> +<html> + <head> + <link rel="stylesheet" href="<%=request.getContextPath()%>/images/style.css" type="text/css" /> + <title>QMan Administration Console</title> + </head> + <body> + <div id="page" align="center"> + <jsp:include page="/fragments/header.jsp"> + <jsp:param name="title" value="Error Page"/> + </jsp:include> + + <div id="content" align="center"> + <jsp:include page="/fragments/menu.jsp"/> + + <div id="contenttext"> + <div class="panel" align="justify" style="height:500px; overflow-y:auto;"> + <span class="bodytext"> + <table width="100%"> + <tr><td nowrap style="font-weight: bold;"> + We are not able to satify your request because an error has happened. + <br>Message : ${errorMessage} + </td></tr> + <tr><td nowrap style="font-size: xx-small; font-weight: bold;"> + <c:forEach var="stackTrace" items="${exception.stackTrace}"> + ${stackTrace} + <br> + </c:forEach> + </td></tr> + </table> + </span> + </div> + </div> + </div> + </div> + </body> +</html> diff --git a/qpid/java/management/client/console/fragments/header.jsp b/qpid/java/management/client/console/fragments/header.jsp index c835dc1bef..b401fee7a0 100644 --- a/qpid/java/management/client/console/fragments/header.jsp +++ b/qpid/java/management/client/console/fragments/header.jsp @@ -1,15 +1,36 @@ -<div id="header" align="center">
- <div id="pagetitle">
- <div id="asf-header" align="left">
- <table width="100%">
- <tr>
- <td align="left"><img src="images/qpid-logo.png" height="100" width="200" /></td>
- <td align="right"><img src="images/asf-logo.png" height="69" width="225" /></td>
- </tr>
- </table>
- </div>
- <div id="title" class="titletext" align="right">
- <span class="bluetitle"><%=request.getParameter("title")%></span>
- </div>
- </div>
-</div>
\ 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. + +--> + +<div id="header" align="center"> + <div id="pagetitle"> + <div id="asf-header" align="left"> + <table width="100%"> + <tr> + <td align="left"><img src="images/qpid-logo.png" height="100" width="200" /></td> + <td align="right"><img src="images/asf-logo.png" height="69" width="225" /></td> + </tr> + </table> + </div> + <div id="title" class="titletext" align="right"> + <span class="bluetitle"><%=request.getParameter("title")%></span> + </div> + </div> +</div> diff --git a/qpid/java/management/client/console/fragments/menu.jsp b/qpid/java/management/client/console/fragments/menu.jsp index 971123e996..6924fd5d43 100644 --- a/qpid/java/management/client/console/fragments/menu.jsp +++ b/qpid/java/management/client/console/fragments/menu.jsp @@ -1,10 +1,31 @@ -<div id="menu" align="center">
- <div id="linksmenu" align="left">
- <a href="<%=request.getContextPath()%>/console"> > System Overview</a>
- <a href="<%=request.getContextPath()%>/brokers_management"> > Brokers Management</a>
- <a href="<%=request.getContextPath()%>/resources_management"> > Resources Management</a>
- <a> > Subscriptions Management</a>
- <a> > System Health</a>
- <a href="<%=request.getContextPath()%>/logging_configuration"> > Logging Configuration</a>
- </div>
-</div>
+<!-- + + 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. + +--> + +<div id="menu" align="center"> + <div id="linksmenu" align="left"> + <a href="<%=request.getContextPath()%>/console"> > System Overview</a> + <a href="<%=request.getContextPath()%>/brokers_management"> > Brokers Management</a> + <a href="<%=request.getContextPath()%>/resources_management"> > Resources Management</a> + <a> > Subscriptions Management</a> + <a> > System Health</a> + <a href="<%=request.getContextPath()%>/logging_configuration"> > Logging Configuration</a> + </div> +</div> diff --git a/qpid/java/management/client/console/images/style.css b/qpid/java/management/client/console/images/style.css index f8dece6f32..a32682fa2f 100644 --- a/qpid/java/management/client/console/images/style.css +++ b/qpid/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/qpid/java/management/client/console/jmx_perspective.jsp b/qpid/java/management/client/console/jmx_perspective.jsp index e1d421e701..5d276a0edc 100644 --- a/qpid/java/management/client/console/jmx_perspective.jsp +++ b/qpid/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"%>
-<html>
- <head>
- <link rel="stylesheet" href="<%=request.getContextPath()%>/images/style.css" type="text/css" />
- <title>QMan Administration Console</title>
- </head>
- <body>
- <div id="page" align="center">
- <jsp:include page="/fragments/header.jsp">
- <jsp:param name="title" value="Resource Management - JMX Perspective"/>
- </jsp:include>
-
- <div id="content" align="center">
- <jsp:include page="/fragments/menu.jsp"/>
-
- <div id="contenttext">
- <div id="wsdmmenu" align="left">
- <ul>
- <li><a href="<%=request.getContextPath()%>/jmx_perspective?resourceId=${resourceId}"><span>JMX</span></a></li>
- <li><a href="<%=request.getContextPath()%>/wsdm_properties_perspective?resourceId=${resourceId}"><span>WS-DM</span></a></li>
- </ul>
- </div>
- <br />
- <div class="panel" align="justify">
- <span class="bodytext">
- <table width="100%">
- <tr>
- <td valign="top" colspan="2">
- <fieldset>
- <legend>ObjectName</legend>
- <ul>
- <c:forEach var="property" items="${nameAttributes}">
- <li>
- <c:out value="${property}"/>
- </li>
- </c:forEach>
- </ul>
- </fieldset>
- </td>
- </tr>
- <tr>
- <td valign="top">
- <fieldset>
- <legend>Attributes</legend>
- <table width="100%" cellspacing="1">
- <tr>
- <th>Name</th>
- <th>Type</th>
- <th>Value</th>
- <th>Access</th>
- </tr>
- <c:forEach var="attribute" items="${metadata.attributes}" varStatus="rowCounter">
- <c:choose>
- <c:when test="${rowCounter.count % 2 == 0}">
- <c:set var="bgcolor" scope="page" value="EAEAEA"/>
- </c:when>
- <c:otherwise>
- <c:set var="bgcolor" scope="page" value="FFFFFF"/>
- </c:otherwise>
- </c:choose>
- <c:choose>
- <c:when test="${attribute.writable}">
- <c:set var="access" scope="page" value="RW"/>
- </c:when>
- <c:otherwise>
- <c:set var="access" scope="page" value="RO"/>
- </c:otherwise>
- </c:choose>
- <tr>
- <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${attribute.name}"/></td>
- <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${attribute.type}"/></td>
- <td style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${attributes[attribute.name]}"/></td>
- <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${access}"/></td>
- </tr>
- </c:forEach>
- </table>
- </fieldset>
- </td>
- <td valign="top">
- <fieldset>
- <legend>Operations</legend>
- <table width="100%" cellspacing="0">
- <tr>
- <th>Name</th>
- <th>Arguments</th>
- </tr>
-
- <c:forEach var="operation" items="${metadata.operations}" varStatus="rowCounter">
- <c:choose>
- <c:when test="${rowCounter.count % 2 == 0}">
- <c:set var="bgcolor" scope="page" value="EAEAEA"/>
- </c:when>
- <c:otherwise>
- <c:set var="bgcolor" scope="page" value="FFFFFF"/>
- </c:otherwise>
- </c:choose>
- <tr>
- <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${operation.name}"/></td>
- <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}">
- <ul>
- <c:forEach var="argument" items="${operation.signature}">
- <li>
- <c:out value="${argument.name}"/> (<c:out value="${argument.type}"/>)
- </li>
- </c:forEach>
- </ul>
- </td>
- </tr>
- </c:forEach>
- </fieldset>
- </td>
- </tr>
- </table>
- </span>
- </div>
- </div>
-
-
-
-
-
-
-
-
-
-
- </div>
- </div>
- </body>
-</html>
\ 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. + +--> + +<%@ 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"%> +<html> + <head> + <link rel="stylesheet" href="<%=request.getContextPath()%>/images/style.css" type="text/css" /> + <title>QMan Administration Console</title> + </head> + <body> + <div id="page" align="center"> + <jsp:include page="/fragments/header.jsp"> + <jsp:param name="title" value="Resource Management - JMX Perspective"/> + </jsp:include> + + <div id="content" align="center"> + <jsp:include page="/fragments/menu.jsp"/> + + <div id="contenttext"> + <div id="wsdmmenu" align="left"> + <ul> + <li><a href="<%=request.getContextPath()%>/jmx_perspective?resourceId=${resourceId}"><span>JMX</span></a></li> + <li><a href="<%=request.getContextPath()%>/wsdm_properties_perspective?resourceId=${resourceId}"><span>WS-DM</span></a></li> + </ul> + </div> + <br /> + <div class="panel" align="justify"> + <span class="bodytext"> + <table width="100%"> + <tr> + <td valign="top" colspan="2"> + <fieldset> + <legend>ObjectName</legend> + <ul> + <c:forEach var="property" items="${nameAttributes}"> + <li> + <c:out value="${property}"/> + </li> + </c:forEach> + </ul> + </fieldset> + </td> + </tr> + <tr> + <td valign="top"> + <fieldset> + <legend>Attributes</legend> + <table width="100%" cellspacing="1"> + <tr> + <th>Name</th> + <th>Type</th> + <th>Value</th> + <th>Access</th> + </tr> + <c:forEach var="attribute" items="${metadata.attributes}" varStatus="rowCounter"> + <c:choose> + <c:when test="${rowCounter.count % 2 == 0}"> + <c:set var="bgcolor" scope="page" value="EAEAEA"/> + </c:when> + <c:otherwise> + <c:set var="bgcolor" scope="page" value="FFFFFF"/> + </c:otherwise> + </c:choose> + <c:choose> + <c:when test="${attribute.writable}"> + <c:set var="access" scope="page" value="RW"/> + </c:when> + <c:otherwise> + <c:set var="access" scope="page" value="RO"/> + </c:otherwise> + </c:choose> + <tr> + <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${attribute.name}"/></td> + <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${attribute.type}"/></td> + <td style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${attributes[attribute.name]}"/></td> + <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${access}"/></td> + </tr> + </c:forEach> + </table> + </fieldset> + </td> + <td valign="top"> + <fieldset> + <legend>Operations</legend> + <table width="100%" cellspacing="0"> + <tr> + <th>Name</th> + <th>Arguments</th> + </tr> + + <c:forEach var="operation" items="${metadata.operations}" varStatus="rowCounter"> + <c:choose> + <c:when test="${rowCounter.count % 2 == 0}"> + <c:set var="bgcolor" scope="page" value="EAEAEA"/> + </c:when> + <c:otherwise> + <c:set var="bgcolor" scope="page" value="FFFFFF"/> + </c:otherwise> + </c:choose> + <tr> + <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${operation.name}"/></td> + <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"> + <ul> + <c:forEach var="argument" items="${operation.signature}"> + <li> + <c:out value="${argument.name}"/> (<c:out value="${argument.type}"/>) + </li> + </c:forEach> + </ul> + </td> + </tr> + </c:forEach> + </fieldset> + </td> + </tr> + </table> + </span> + </div> + </div> + + + + + + + + + + + </div> + </div> + </body> +</html> diff --git a/qpid/java/management/client/console/logging_configuration.jsp b/qpid/java/management/client/console/logging_configuration.jsp index 764bc5a85c..89f10567fa 100644 --- a/qpid/java/management/client/console/logging_configuration.jsp +++ b/qpid/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'%>
-<html>
- <head>
- <link rel="stylesheet" href="<%=request.getContextPath()%>/images/style.css" type="text/css" />
- <title>QMan Administration Console</title>
- </head>
- <body>
- <div id="page" align="center">
- <jsp:include page="/fragments/header.jsp">
- <jsp:param name="title" value="Logging Configuration"/>
- </jsp:include>
-
- <div id="content" align="center">
- <jsp:include page="/fragments/menu.jsp"/>
-
- <div id="contenttext">
- <div class="panel" align="justify" style="height:500px; overflow-y:auto;">
- <span class="bodytext">
- <form method="post" name="form" action="<%=request.getContextPath() %>/logging_configuration">
- <table>
- <tr>
- <td>
- <fieldset>
- <legend>WSDL & RDM Debugger</legend>
- <table>
- <tr>
- <td>
- <c:choose>
- <c:when test="${wsdlDebugEnabled}">
- <c:set var="checked" scope="page" value="checked"/>
- </c:when>
- <c:otherwise>
- <c:set var="checked" scope="page" value=""/>
- </c:otherwise>
- </c:choose>
- <input type="checkbox" ${checked} name="wsdlDebugEnabled" />
- </td>
- <td nowrap style="font-size: x-small;">
- When this flag is checked all WSDL and RMD messages are written on log file (or console depending on your configuration.)
- </td>
- </tr>
- </table>
- </fieldset>
- </td>
- </tr>
-
- <tr>
- <td>
- <fieldset>
- <legend>SOAP Messages Debugger</legend>
- <table>
-
- <tr>
- <td>
- <c:choose>
- <c:when test="${soapDebugEnabled}">
- <c:set var="checked" scope="page" value="checked"/>
- </c:when>
- <c:otherwise>
- <c:set var="checked" scope="page" value=""/>
- </c:otherwise>
- </c:choose>
- <input ${checked} type="checkbox" name="soapDebugEnabled"/>
- </td>
- <td nowrap style="font-size: x-small;">
- When this flag is checked all SOAP messages (requests & responses) are written on log file (or console depending on your configuration.)
- </td>
- </tr>
- </table>
- </fieldset>
- </td>
- </tr>
-
- <tr>
- <td>
- <fieldset>
- <legend>QMan Logger Level</legend>
- <table>
- <tr>
- <td>
- <c:choose>
- <c:when test="${qmanLogLevel == 'DEBUG'}">
- <c:set var="qmanDebug" scope="page" value="selected='true'"/>
- </c:when>
- <c:otherwise>
- <c:set var="qmanDebug" scope="page" value=""/>
- </c:otherwise>
- </c:choose>
- <c:choose>
- <c:when test="${qmanLogLevel == 'INFO'}">
- <c:set var="qmanInfo" scope="page" value="selected='true'"/>
- </c:when>
- <c:otherwise>
- <c:set var="qmanInfo" scope="page" value=""/>
- </c:otherwise>
- </c:choose>
- <c:choose>
- <c:when test="${qmanLogLevel == 'WARN'}">
- <c:set var="qmanWarn" scope="page" value="selected='true'"/>
- </c:when>
- <c:otherwise>
- <c:set var="qmanWarn" scope="page" value=""/>
- </c:otherwise>
- </c:choose>
- <c:choose>
- <c:when test="${qmanLogLevel == 'ERROR'}">
- <c:set var="qmanError" scope="page" value="selected='true'"/>
- </c:when>
- <c:otherwise>
- <c:set var="qmanError" scope="page" value=""/>
- </c:otherwise>
- </c:choose>
- <c:choose>
- <c:when test="${qmanLogLevel == 'FATAL'}">
- <c:set var="qmanFatal" scope="page" value="selected='true'"/>
- </c:when>
- <c:otherwise>
- <c:set var="qmanFatal" scope="page" value=""/>
- </c:otherwise>
- </c:choose>
-
- <select name="qmanLogLevel">
- <option ${qmanDebug} value="DEBUG">DEBUG</option>
- <option ${qmanWarn} value="WARN">WARNING</option>
- <option ${qmanInfo} value="INFO">INFO</option>
- <option ${qmanError} value="ERROR">ERROR</option>
- <option ${qmanFatal} value="FATAL">FATAL</option>
- </select>
- </td>
- <td nowrap style="font-size: x-small;">
- This is the current priority level set for QMan module (and sub-modules). Note that a WARNING level is recomended in production.
- </td>
- </tr>
- </table>
- </fieldset>
- </td>
- </tr>
-
- <tr>
- <td>
- <fieldset>
- <legend>Web Server Logger Level</legend>
- <table>
-
- <tr>
- <td>
- <c:choose>
- <c:when test="${webServerLogLevel == 'DEBUG'}">
- <c:set var="webServerDebug" scope="page" value="selected='true'"/>
- </c:when>
- <c:otherwise>
- <c:set var="webServerDebug" scope="page" value=""/>
- </c:otherwise>
- </c:choose>
- <c:choose>
- <c:when test="${webServerLogLevel == 'INFO'}">
- <c:set var="webServerInfo" scope="page" value="selected='true'"/>
- </c:when>
- <c:otherwise>
- <c:set var="webServerInfo" scope="page" value=""/>
- </c:otherwise>
- </c:choose>
- <c:choose>
- <c:when test="${webServerLogLevel == 'WARN'}">
- <c:set var="webServerWarn" scope="page" value="selected='true'"/>
- </c:when>
- <c:otherwise>
- <c:set var="webServerWarn" scope="page" value=""/>
- </c:otherwise>
- </c:choose>
- <c:choose>
- <c:when test="${webServerLogLevel == 'ERROR'}">
- <c:set var="webServerError" scope="page" value="selected='true'"/>
- </c:when>
- <c:otherwise>
- <c:set var="webServerError" scope="page" value=""/>
- </c:otherwise>
- </c:choose>
- <c:choose>
- <c:when test="${webServerLogLevel == 'FATAL'}">
- <c:set var="webServerFatal" scope="page" value="selected='true'"/>
- </c:when>
- <c:otherwise>
- <c:set var="webServerFatal" scope="page" value=""/>
- </c:otherwise>
- </c:choose>
-
- <select name="webServerLogLevel">
- <option ${webServerDebug} value="DEBUG" >DEBUG</option>
- <option ${webServerWarn} value="WARN">WARNING</option>
- <option ${webServerInfo} value="INFO">INFO</option>
- <option ${webServerError} value="ERROR">ERROR</option>
- <option ${webServerFatak} value="FATAL">FATAL</option>
- </select>
- </td>
- <td nowrap style="font-size: x-small; ">
- This is the current priority level set for QMan module (and sub-modules). Note that a WARNING level is recomended in production.
- </td>
- </tr>
- </table>
- </fieldset>
- </td>
- </tr>
- <tr>
- <td>
- <input type="submit" value="Submit" title="Submit"/>
- </td>
- </tr>
- </table>
- <br/></br>
- <span style="fony-size: medium; color: red; font-weight: bold">Note that in general a DEBUG level is not reccommended in production (especially for WSDL and SOAP debugger).</span>
- </form>
- </span>
- </div>
- </div>
- </div>
- </div>
- </body>
-</html>
\ 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. + +--> + +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> +<html> + <head> + <link rel="stylesheet" href="<%=request.getContextPath()%>/images/style.css" type="text/css" /> + <title>QMan Administration Console</title> + </head> + <body> + <div id="page" align="center"> + <jsp:include page="/fragments/header.jsp"> + <jsp:param name="title" value="Logging Configuration"/> + </jsp:include> + + <div id="content" align="center"> + <jsp:include page="/fragments/menu.jsp"/> + + <div id="contenttext"> + <div class="panel" align="justify" style="height:500px; overflow-y:auto;"> + <span class="bodytext"> + <form method="post" name="form" action="<%=request.getContextPath() %>/logging_configuration"> + <table> + <tr> + <td> + <fieldset> + <legend>WSDL & RDM Debugger</legend> + <table> + <tr> + <td> + <c:choose> + <c:when test="${wsdlDebugEnabled}"> + <c:set var="checked" scope="page" value="checked"/> + </c:when> + <c:otherwise> + <c:set var="checked" scope="page" value=""/> + </c:otherwise> + </c:choose> + <input type="checkbox" ${checked} name="wsdlDebugEnabled" /> + </td> + <td nowrap style="font-size: x-small;"> + When this flag is checked all WSDL and RMD messages are written on log file (or console depending on your configuration.) + </td> + </tr> + </table> + </fieldset> + </td> + </tr> + + <tr> + <td> + <fieldset> + <legend>SOAP Messages Debugger</legend> + <table> + + <tr> + <td> + <c:choose> + <c:when test="${soapDebugEnabled}"> + <c:set var="checked" scope="page" value="checked"/> + </c:when> + <c:otherwise> + <c:set var="checked" scope="page" value=""/> + </c:otherwise> + </c:choose> + <input ${checked} type="checkbox" name="soapDebugEnabled"/> + </td> + <td nowrap style="font-size: x-small;"> + When this flag is checked all SOAP messages (requests & responses) are written on log file (or console depending on your configuration.) + </td> + </tr> + </table> + </fieldset> + </td> + </tr> + + <tr> + <td> + <fieldset> + <legend>QMan Logger Level</legend> + <table> + <tr> + <td> + <c:choose> + <c:when test="${qmanLogLevel == 'DEBUG'}"> + <c:set var="qmanDebug" scope="page" value="selected='true'"/> + </c:when> + <c:otherwise> + <c:set var="qmanDebug" scope="page" value=""/> + </c:otherwise> + </c:choose> + <c:choose> + <c:when test="${qmanLogLevel == 'INFO'}"> + <c:set var="qmanInfo" scope="page" value="selected='true'"/> + </c:when> + <c:otherwise> + <c:set var="qmanInfo" scope="page" value=""/> + </c:otherwise> + </c:choose> + <c:choose> + <c:when test="${qmanLogLevel == 'WARN'}"> + <c:set var="qmanWarn" scope="page" value="selected='true'"/> + </c:when> + <c:otherwise> + <c:set var="qmanWarn" scope="page" value=""/> + </c:otherwise> + </c:choose> + <c:choose> + <c:when test="${qmanLogLevel == 'ERROR'}"> + <c:set var="qmanError" scope="page" value="selected='true'"/> + </c:when> + <c:otherwise> + <c:set var="qmanError" scope="page" value=""/> + </c:otherwise> + </c:choose> + <c:choose> + <c:when test="${qmanLogLevel == 'FATAL'}"> + <c:set var="qmanFatal" scope="page" value="selected='true'"/> + </c:when> + <c:otherwise> + <c:set var="qmanFatal" scope="page" value=""/> + </c:otherwise> + </c:choose> + + <select name="qmanLogLevel"> + <option ${qmanDebug} value="DEBUG">DEBUG</option> + <option ${qmanWarn} value="WARN">WARNING</option> + <option ${qmanInfo} value="INFO">INFO</option> + <option ${qmanError} value="ERROR">ERROR</option> + <option ${qmanFatal} value="FATAL">FATAL</option> + </select> + </td> + <td nowrap style="font-size: x-small;"> + This is the current priority level set for QMan module (and sub-modules). Note that a WARNING level is recomended in production. + </td> + </tr> + </table> + </fieldset> + </td> + </tr> + + <tr> + <td> + <fieldset> + <legend>Web Server Logger Level</legend> + <table> + + <tr> + <td> + <c:choose> + <c:when test="${webServerLogLevel == 'DEBUG'}"> + <c:set var="webServerDebug" scope="page" value="selected='true'"/> + </c:when> + <c:otherwise> + <c:set var="webServerDebug" scope="page" value=""/> + </c:otherwise> + </c:choose> + <c:choose> + <c:when test="${webServerLogLevel == 'INFO'}"> + <c:set var="webServerInfo" scope="page" value="selected='true'"/> + </c:when> + <c:otherwise> + <c:set var="webServerInfo" scope="page" value=""/> + </c:otherwise> + </c:choose> + <c:choose> + <c:when test="${webServerLogLevel == 'WARN'}"> + <c:set var="webServerWarn" scope="page" value="selected='true'"/> + </c:when> + <c:otherwise> + <c:set var="webServerWarn" scope="page" value=""/> + </c:otherwise> + </c:choose> + <c:choose> + <c:when test="${webServerLogLevel == 'ERROR'}"> + <c:set var="webServerError" scope="page" value="selected='true'"/> + </c:when> + <c:otherwise> + <c:set var="webServerError" scope="page" value=""/> + </c:otherwise> + </c:choose> + <c:choose> + <c:when test="${webServerLogLevel == 'FATAL'}"> + <c:set var="webServerFatal" scope="page" value="selected='true'"/> + </c:when> + <c:otherwise> + <c:set var="webServerFatal" scope="page" value=""/> + </c:otherwise> + </c:choose> + + <select name="webServerLogLevel"> + <option ${webServerDebug} value="DEBUG" >DEBUG</option> + <option ${webServerWarn} value="WARN">WARNING</option> + <option ${webServerInfo} value="INFO">INFO</option> + <option ${webServerError} value="ERROR">ERROR</option> + <option ${webServerFatak} value="FATAL">FATAL</option> + </select> + </td> + <td nowrap style="font-size: x-small; "> + This is the current priority level set for QMan module (and sub-modules). Note that a WARNING level is recomended in production. + </td> + </tr> + </table> + </fieldset> + </td> + </tr> + <tr> + <td> + <input type="submit" value="Submit" title="Submit"/> + </td> + </tr> + </table> + <br/></br> + <span style="fony-size: medium; color: red; font-weight: bold">Note that in general a DEBUG level is not reccommended in production (especially for WSDL and SOAP debugger).</span> + </form> + </span> + </div> + </div> + </div> + </div> + </body> +</html> diff --git a/qpid/java/management/client/console/resources_management.jsp b/qpid/java/management/client/console/resources_management.jsp index 1541f3a5bc..4a6f9efed6 100644 --- a/qpid/java/management/client/console/resources_management.jsp +++ b/qpid/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");
-%>
-<html>
- <head>
- <link rel="stylesheet" href="<%=request.getContextPath()%>/images/style.css" type="text/css" />
- <title>QMan Administration Console</title>
- </head>
- <body>
- <div id="page" align="center">
- <jsp:include page="/fragments/header.jsp">
- <jsp:param name="title" value="Resources Management"/>
- </jsp:include>
-
- <div id="content" align="center">
- <jsp:include page="/fragments/menu.jsp"/>
-
-
- <div id="contenttext">
- <div id="wsdmmenu" align="left">
- <ul>
- <% if (model != null) {%>
- <li><a href="#"><span>${model.id}</span></a></li>
- <%} %>
- </ul>
- </div>
- <br />
- <div class="panel" align="justify" style="height:500px; overflow-y:auto;">
- <span class="bodytext">
- <table width="100%" border="0" cellpadding="1" cellspacing="2">
-<%
- if (model != null ){
- Set<String> categoryNames = model.getCategoryNames();
- for(String categoryName : categoryNames)
- {
- List<ObjectName> categoryObjects = model.getCategory(categoryName);
-%>
- <tr>
- <td valign="top" nowrap align="left">
- <fieldset>
- <legend><%=categoryName%></legend>
- <h4 style="color: #006633; font-size: xx-small">
- <ul>
- <%
- for (ObjectName objectName : categoryObjects)
- {%>
-
- <li>
- <a href="<%=request.getContextPath()%>/jmx_perspective?resourceId=<%=objectName%>">
- <%=objectName.getKeyProperty(Names.OBJECT_ID)%>
- </a>
- </li>
- <%
- }
- %>
- </ul>
- </fieldset>
- </td>
- </tr>
-<%
- }
- } else {
-%>
-<table><tr>
-<td nowrap style="font-weight: bold;" >Sorry, but it seems that QMan is not connected with any broker...</td>
-</tr>
-</table>
-<%
- }
-%>
- </table>
- </span>
- </div>
- </div>
- </body>
-</html>
\ 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. + +--> + +<%@ 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"); +%> +<html> + <head> + <link rel="stylesheet" href="<%=request.getContextPath()%>/images/style.css" type="text/css" /> + <title>QMan Administration Console</title> + </head> + <body> + <div id="page" align="center"> + <jsp:include page="/fragments/header.jsp"> + <jsp:param name="title" value="Resources Management"/> + </jsp:include> + + <div id="content" align="center"> + <jsp:include page="/fragments/menu.jsp"/> + + + <div id="contenttext"> + <div id="wsdmmenu" align="left"> + <ul> + <% if (model != null) {%> + <li><a href="#"><span>${model.id}</span></a></li> + <%} %> + </ul> + </div> + <br /> + <div class="panel" align="justify" style="height:500px; overflow-y:auto;"> + <span class="bodytext"> + <table width="100%" border="0" cellpadding="1" cellspacing="2"> +<% + if (model != null ){ + Set<String> categoryNames = model.getCategoryNames(); + for(String categoryName : categoryNames) + { + List<ObjectName> categoryObjects = model.getCategory(categoryName); +%> + <tr> + <td valign="top" nowrap align="left"> + <fieldset> + <legend><%=categoryName%></legend> + <h4 style="color: #006633; font-size: xx-small"> + <ul> + <% + for (ObjectName objectName : categoryObjects) + {%> + + <li> + <a href="<%=request.getContextPath()%>/jmx_perspective?resourceId=<%=objectName%>"> + <%=objectName.getKeyProperty(Names.OBJECT_ID)%> + </a> + </li> + <% + } + %> + </ul> + </fieldset> + </td> + </tr> +<% + } + } else { +%> +<table><tr> +<td nowrap style="font-weight: bold;" >Sorry, but it seems that QMan is not connected with any broker...</td> +</tr> +</table> +<% + } +%> + </table> + </span> + </div> + </div> + </body> +</html> diff --git a/qpid/java/management/client/console/tbd.jsp b/qpid/java/management/client/console/tbd.jsp index 486a4cff86..3c1c87a7b0 100644 --- a/qpid/java/management/client/console/tbd.jsp +++ b/qpid/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'%>
-<html>
- <head>
- <link rel="stylesheet" href="<%=request.getContextPath()%>/images/style.css" type="text/css" />
- <title>QMan Administration Console</title>
- </head>
- <body>
- <div id="page" align="center">
- <jsp:include page="/fragments/header.jsp">
- <jsp:param name="title" value="TBD"/>
- </jsp:include>
-
- <div id="content" align="center">
- <jsp:include page="/fragments/menu.jsp"/>
-
- <div id="contenttext">
- <div class="panel" align="justify" style="height:500px; overflow-y:auto;">
- <span class="bodytext">
- Sorry, this feature is not yet available!
- </span>
- </div>
- </div>
- </div>
- </div>
- </body>
-</html>
\ 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. + +--> + +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%> +<html> + <head> + <link rel="stylesheet" href="<%=request.getContextPath()%>/images/style.css" type="text/css" /> + <title>QMan Administration Console</title> + </head> + <body> + <div id="page" align="center"> + <jsp:include page="/fragments/header.jsp"> + <jsp:param name="title" value="TBD"/> + </jsp:include> + + <div id="content" align="center"> + <jsp:include page="/fragments/menu.jsp"/> + + <div id="contenttext"> + <div class="panel" align="justify" style="height:500px; overflow-y:auto;"> + <span class="bodytext"> + Sorry, this feature is not yet available! + </span> + </div> + </div> + </div> + </div> + </body> +</html> diff --git a/qpid/java/management/client/console/wsdm_operations_perspective.jsp b/qpid/java/management/client/console/wsdm_operations_perspective.jsp index f4038b2e14..50f67c4492 100644 --- a/qpid/java/management/client/console/wsdm_operations_perspective.jsp +++ b/qpid/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<String,String> java2Xml = new HashMap<String,String>();
-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"%>
-<html>
- <head>
- <link rel="stylesheet" href="<%=request.getContextPath()%>/images/style.css" type="text/css" />
- <title>QMan Administration Console</title>
- </head>
- <body>
- <div id="page" align="center">
- <jsp:include page="/fragments/header.jsp">
- <jsp:param name="title" value="Resource Management - WS-DM Operations Perspective"/>
- </jsp:include>
-
- <div id="content" align="center">
- <jsp:include page="/fragments/menu.jsp"/>
-
- <div id="contenttext">
- <div id="wsdmmenu" align="left">
- <ul>
- <li><a href="<%=request.getContextPath()%>/jmx_perspective?resourceId=${resourceId}"><span>JMX</span></a></li>
- <li><a href="<%=request.getContextPath()%>/wsdm_properties_perspective?wsresourceId=${resourceId}"><span>WS-DM</span></a></li>
- </ul>
- </div>
- <br />
- <div class="panel" align="justify">
- <span class="bodytext">
- <table width="100%">
- <tr>
- <td valign="top" colspan="2">
- <fieldset>
- <legend>Resource ID</legend>
- <ul>
- <c:forEach var="property" items="${nameAttributes}">
- <li>
- <c:out value="${property}"/>
- </li>
- </c:forEach>
- </ul>
- </fieldset>
- </td>
- </tr>
- <tr>
- <td valign="top">
- <div id="wsdmmenu" align="left" style="font-size: small;">
- <ul>
- <li><a href="<%=request.getContextPath()%>/wsdm_properties_perspective?resourceId=${resourceId}"><span>Properties</span></a></li>
- <li><a href="<%=request.getContextPath()%>/wsdm_operations_perspective?resourceId=${resourceId}""><span>Operations</span></a></li>
- <li><a href="<%=request.getContextPath()%>/wsdm_wsdl_perspective?resourceId=${resourceId}""><span>WSDL</span></a></li>
- <li><a href="<%=request.getContextPath()%>/wsdm_rmd_perspective?resourceId=${resourceId}""><span>RDM</span></a></li>
- </ul>
- </div>
- </td>
- </tr>
- <tr>
- <td valign="top">
- <fieldset>
- <legend>Attributes</legend>
- <table width="100%" cellspacing="1">
- <tr>
- <th nowrap="nowrap" align="center">Name</th>
- <th nowrap="nowrap" align="center">Arguments</th>
- <th nowrap="nowrap" align="center">Faults</th>
- </tr>
- <c:forEach var="operation" items="${metadata.operations}" varStatus="rowCounter">
- <c:choose>
- <c:when test="${rowCounter.count % 2 == 0}">
- <c:set var="bgcolor" scope="page" value="EAEAEA"/>
- </c:when>
- <c:otherwise>
- <c:set var="bgcolor" scope="page" value="FFFFFF"/>
- </c:otherwise>
- </c:choose>
- <tr>
- <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${operation.name}"/></td>
- <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}">
- <ul>
- <c:forEach var="argument" items="${operation.signature}">
- <li>
- <c:out value="${argument.name}"/> (<c:out value="${types[argument.type]}"/>)
- </li>
- </c:forEach>
- </ul>
- </td>
- <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}">
- <ul>
- <li>qman:EntityInstanceNotFoundFault</li>
- <li>qman:OperationInvocationFault</li>
- <li>qman:QManFault</li>
- </ul>
- </td>
- </tr>
- </c:forEach>
- </table>
- </fieldset>
- </td>
- </tr>
- </table>
- </span>
- </div>
- </div>
- </div>
- </div>
- </body>
-</html>
\ 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. + +--> + +<%@ 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<String,String> java2Xml = new HashMap<String,String>(); +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"%> +<html> + <head> + <link rel="stylesheet" href="<%=request.getContextPath()%>/images/style.css" type="text/css" /> + <title>QMan Administration Console</title> + </head> + <body> + <div id="page" align="center"> + <jsp:include page="/fragments/header.jsp"> + <jsp:param name="title" value="Resource Management - WS-DM Operations Perspective"/> + </jsp:include> + + <div id="content" align="center"> + <jsp:include page="/fragments/menu.jsp"/> + + <div id="contenttext"> + <div id="wsdmmenu" align="left"> + <ul> + <li><a href="<%=request.getContextPath()%>/jmx_perspective?resourceId=${resourceId}"><span>JMX</span></a></li> + <li><a href="<%=request.getContextPath()%>/wsdm_properties_perspective?wsresourceId=${resourceId}"><span>WS-DM</span></a></li> + </ul> + </div> + <br /> + <div class="panel" align="justify"> + <span class="bodytext"> + <table width="100%"> + <tr> + <td valign="top" colspan="2"> + <fieldset> + <legend>Resource ID</legend> + <ul> + <c:forEach var="property" items="${nameAttributes}"> + <li> + <c:out value="${property}"/> + </li> + </c:forEach> + </ul> + </fieldset> + </td> + </tr> + <tr> + <td valign="top"> + <div id="wsdmmenu" align="left" style="font-size: small;"> + <ul> + <li><a href="<%=request.getContextPath()%>/wsdm_properties_perspective?resourceId=${resourceId}"><span>Properties</span></a></li> + <li><a href="<%=request.getContextPath()%>/wsdm_operations_perspective?resourceId=${resourceId}""><span>Operations</span></a></li> + <li><a href="<%=request.getContextPath()%>/wsdm_wsdl_perspective?resourceId=${resourceId}""><span>WSDL</span></a></li> + <li><a href="<%=request.getContextPath()%>/wsdm_rmd_perspective?resourceId=${resourceId}""><span>RDM</span></a></li> + </ul> + </div> + </td> + </tr> + <tr> + <td valign="top"> + <fieldset> + <legend>Attributes</legend> + <table width="100%" cellspacing="1"> + <tr> + <th nowrap="nowrap" align="center">Name</th> + <th nowrap="nowrap" align="center">Arguments</th> + <th nowrap="nowrap" align="center">Faults</th> + </tr> + <c:forEach var="operation" items="${metadata.operations}" varStatus="rowCounter"> + <c:choose> + <c:when test="${rowCounter.count % 2 == 0}"> + <c:set var="bgcolor" scope="page" value="EAEAEA"/> + </c:when> + <c:otherwise> + <c:set var="bgcolor" scope="page" value="FFFFFF"/> + </c:otherwise> + </c:choose> + <tr> + <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${operation.name}"/></td> + <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"> + <ul> + <c:forEach var="argument" items="${operation.signature}"> + <li> + <c:out value="${argument.name}"/> (<c:out value="${types[argument.type]}"/>) + </li> + </c:forEach> + </ul> + </td> + <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"> + <ul> + <li>qman:EntityInstanceNotFoundFault</li> + <li>qman:OperationInvocationFault</li> + <li>qman:QManFault</li> + </ul> + </td> + </tr> + </c:forEach> + </table> + </fieldset> + </td> + </tr> + </table> + </span> + </div> + </div> + </div> + </div> + </body> +</html> diff --git a/qpid/java/management/client/console/wsdm_properties_perspective.jsp b/qpid/java/management/client/console/wsdm_properties_perspective.jsp index 2e8699e309..7769abc71c 100644 --- a/qpid/java/management/client/console/wsdm_properties_perspective.jsp +++ b/qpid/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<String,String> java2Xml = new HashMap<String,String>();
-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"%>
-<html>
- <head>
- <link rel="stylesheet" href="<%=request.getContextPath()%>/images/style.css" type="text/css" />
- <title>QMan Administration Console</title>
- </head>
- <body>
- <div id="page" align="center">
- <jsp:include page="/fragments/header.jsp">
- <jsp:param name="title" value="Resource Management - WS-DM Properties Perspective"/>
- </jsp:include>
-
- <div id="content" align="center">
- <jsp:include page="/fragments/menu.jsp"/>
-
- <div id="contenttext">
- <div id="wsdmmenu" align="left">
- <ul>
- <li><a href="<%=request.getContextPath()%>/jmx_perspective?resourceId=${resourceId}"><span>JMX</span></a></li>
- <li><a href="<%=request.getContextPath()%>/wsdm_properties_perspective?resourceId=${resourceId}"><span>WS-DM</span></a></li>
- </ul>
- </div>
- <br />
- <div class="panel" align="justify">
- <span class="bodytext">
- <table width="100%">
- <tr>
- <td valign="top" colspan="2">
- <fieldset>
- <legend>Resource ID</legend>
- <ul>
- <c:forEach var="property" items="${nameAttributes}">
- <li>
- <c:out value="${property}"/>
- </li>
- </c:forEach>
- </ul>
- </fieldset>
- </td>
- </tr>
- <tr>
- <td valign="top">
- <div id="wsdmmenu" align="left" style="font-size: small;">
- <ul>
- <li><a href="<%=request.getContextPath()%>/wsdm_properties_perspective?resourceId=${resourceId}"><span>Properties</span></a></li>
- <li><a href="<%=request.getContextPath()%>/wsdm_operations_perspective?resourceId=${resourceId}""><span>Operations</span></a></li>
- <li><a href="<%=request.getContextPath()%>/wsdm_wsdl_perspective?resourceId=${resourceId}""><span>WSDL</span></a></li>
- <li><a href="<%=request.getContextPath()%>/wsdm_rmd_perspective?resourceId=${resourceId}""><span>RDM</span></a></li>
- </ul>
- </div>
- </td>
- </tr>
- <tr>
- <td valign="top">
- <fieldset>
- <legend>Attributes</legend>
- <table width="100%" cellspacing="1">
- <tr>
- <th nowrap="nowrap" align="center">Name</th>
- <th nowrap="nowrap" align="center" >Type</th>
- <th nowrap="nowrap" align="center">Value</th>
- <th nowrap="nowrap" align="center">Mutable</th>
- <th nowrap="nowrap" align="center">Access</th>
- <th nowrap="nowrap" align="center">Valid Values</th>
- <th nowrap="nowrap" align="center">Static Values</th>
- <th nowrap="nowrap" align="center">Initial Values</th>
- </tr>
- <c:forEach var="attribute" items="${metadata.attributes}" varStatus="rowCounter">
- <c:choose>
- <c:when test="${rowCounter.count % 2 == 0}">
- <c:set var="bgcolor" scope="page" value="EAEAEA"/>
- </c:when>
- <c:otherwise>
- <c:set var="bgcolor" scope="page" value="FFFFFF"/>
- </c:otherwise>
- </c:choose>
- <c:choose>
- <c:when test="${attribute.writable}">
- <c:set var="access" scope="page" value="RW"/>
- </c:when>
- <c:otherwise>
- <c:set var="access" scope="page" value="RO"/>
- </c:otherwise>
- </c:choose>
- <tr>
- <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${attribute.name}"/></td>
- <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${types[attribute.type]}"/></td>
- <td style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${attributes[attribute.name]}"/></td>
- <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}">
- √
- <%--
- <c:out value="${attribute.mutable}"/>
- --%>
- </td>
- <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${access}"/></td>
- <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}">
- N.A.
-<%--
- <ul>
- <c:forEach var="value" items="${attribute.validValues}">
- <li>
- <c:out value="${value}"/>
- </li>
- </c:forEach>
- </ul>
---%>
- </td>
- <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}">
- N.A.
-<%--
- <ul>
- <c:forEach var="value" items="${attribute.staticValues}">
- <li>
- <c:out value="${value}"/>
- </li>
- </c:forEach>
- </ul>
---%>
- </td>
- <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}">
- N.A.
-<%--
- <ul>
- <c:forEach var="value" items="${attribute.initialValues}">
- <li>
- <c:out value="${value}"/>
- </li>
- </c:forEach>
- </ul>
---%>
- </td>
- </tr>
- </c:forEach>
- </table>
- </fieldset>
- </td>
- </tr>
- </table>
- </span>
- </div>
- </div>
- </div>
- </div>
- </body>
-</html>
\ 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. + +--> + +<%@ 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<String,String> java2Xml = new HashMap<String,String>(); +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"%> +<html> + <head> + <link rel="stylesheet" href="<%=request.getContextPath()%>/images/style.css" type="text/css" /> + <title>QMan Administration Console</title> + </head> + <body> + <div id="page" align="center"> + <jsp:include page="/fragments/header.jsp"> + <jsp:param name="title" value="Resource Management - WS-DM Properties Perspective"/> + </jsp:include> + + <div id="content" align="center"> + <jsp:include page="/fragments/menu.jsp"/> + + <div id="contenttext"> + <div id="wsdmmenu" align="left"> + <ul> + <li><a href="<%=request.getContextPath()%>/jmx_perspective?resourceId=${resourceId}"><span>JMX</span></a></li> + <li><a href="<%=request.getContextPath()%>/wsdm_properties_perspective?resourceId=${resourceId}"><span>WS-DM</span></a></li> + </ul> + </div> + <br /> + <div class="panel" align="justify"> + <span class="bodytext"> + <table width="100%"> + <tr> + <td valign="top" colspan="2"> + <fieldset> + <legend>Resource ID</legend> + <ul> + <c:forEach var="property" items="${nameAttributes}"> + <li> + <c:out value="${property}"/> + </li> + </c:forEach> + </ul> + </fieldset> + </td> + </tr> + <tr> + <td valign="top"> + <div id="wsdmmenu" align="left" style="font-size: small;"> + <ul> + <li><a href="<%=request.getContextPath()%>/wsdm_properties_perspective?resourceId=${resourceId}"><span>Properties</span></a></li> + <li><a href="<%=request.getContextPath()%>/wsdm_operations_perspective?resourceId=${resourceId}""><span>Operations</span></a></li> + <li><a href="<%=request.getContextPath()%>/wsdm_wsdl_perspective?resourceId=${resourceId}""><span>WSDL</span></a></li> + <li><a href="<%=request.getContextPath()%>/wsdm_rmd_perspective?resourceId=${resourceId}""><span>RDM</span></a></li> + </ul> + </div> + </td> + </tr> + <tr> + <td valign="top"> + <fieldset> + <legend>Attributes</legend> + <table width="100%" cellspacing="1"> + <tr> + <th nowrap="nowrap" align="center">Name</th> + <th nowrap="nowrap" align="center" >Type</th> + <th nowrap="nowrap" align="center">Value</th> + <th nowrap="nowrap" align="center">Mutable</th> + <th nowrap="nowrap" align="center">Access</th> + <th nowrap="nowrap" align="center">Valid Values</th> + <th nowrap="nowrap" align="center">Static Values</th> + <th nowrap="nowrap" align="center">Initial Values</th> + </tr> + <c:forEach var="attribute" items="${metadata.attributes}" varStatus="rowCounter"> + <c:choose> + <c:when test="${rowCounter.count % 2 == 0}"> + <c:set var="bgcolor" scope="page" value="EAEAEA"/> + </c:when> + <c:otherwise> + <c:set var="bgcolor" scope="page" value="FFFFFF"/> + </c:otherwise> + </c:choose> + <c:choose> + <c:when test="${attribute.writable}"> + <c:set var="access" scope="page" value="RW"/> + </c:when> + <c:otherwise> + <c:set var="access" scope="page" value="RO"/> + </c:otherwise> + </c:choose> + <tr> + <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${attribute.name}"/></td> + <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${types[attribute.type]}"/></td> + <td style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${attributes[attribute.name]}"/></td> + <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"> + √ + <%-- + <c:out value="${attribute.mutable}"/> + --%> + </td> + <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"><c:out value="${access}"/></td> + <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"> + N.A. +<%-- + <ul> + <c:forEach var="value" items="${attribute.validValues}"> + <li> + <c:out value="${value}"/> + </li> + </c:forEach> + </ul> +--%> + </td> + <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"> + N.A. +<%-- + <ul> + <c:forEach var="value" items="${attribute.staticValues}"> + <li> + <c:out value="${value}"/> + </li> + </c:forEach> + </ul> +--%> + </td> + <td nowrap style="font-size: xx-small; font-weight: bold;" bgcolor="${bgcolor}"> + N.A. +<%-- + <ul> + <c:forEach var="value" items="${attribute.initialValues}"> + <li> + <c:out value="${value}"/> + </li> + </c:forEach> + </ul> +--%> + </td> + </tr> + </c:forEach> + </table> + </fieldset> + </td> + </tr> + </table> + </span> + </div> + </div> + </div> + </div> + </body> +</html> diff --git a/qpid/java/management/client/console/wsdm_rmd_perspective.jsp b/qpid/java/management/client/console/wsdm_rmd_perspective.jsp index fe70930627..083732668b 100644 --- a/qpid/java/management/client/console/wsdm_rmd_perspective.jsp +++ b/qpid/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"%>
-<html>
- <head>
- <link rel="stylesheet" href="<%=request.getContextPath()%>/images/style.css" type="text/css" />
- <title>QMan Administration Console</title>
- </head>
- <body>
- <div id="page" align="center">
- <jsp:include page="/fragments/header.jsp">
- <jsp:param name="title" value="Resource Management - WS-DM RMD Perspective"/>
- </jsp:include>
-
- <div id="content" align="center">
- <jsp:include page="/fragments/menu.jsp"/>
-
- <div id="contenttext">
- <div id="wsdmmenu" align="left">
- <ul>
- <li><a href="<%=request.getContextPath()%>/jmx_perspective?resourceId=${resourceId}"><span>JMX</span></a></li>
- <li><a href="<%=request.getContextPath()%>/wsdm_properties_perspective?wsresourceId=${resourceId}"><span>WS-DM</span></a></li>
- </ul>
- </div>
- <br />
- <div class="panel" align="justify">
- <span class="bodytext">
- <table width="100%">
- <tr>
- <td valign="top" colspan="2">
- <fieldset>
- <legend>Resource ID</legend>
- <ul>
- <c:forEach var="property" items="${nameAttributes}">
- <li>
- <c:out value="${property}"/>
- </li>
- </c:forEach>
- </ul>
- </fieldset>
- </td>
- </tr>
- <tr>
- <td valign="top">
- <div id="wsdmmenu" align="left" style="font-size: small;">
- <ul>
- <li><a href="<%=request.getContextPath()%>/wsdm_properties_perspective?resourceId=${resourceId}"><span>Properties</span></a></li>
- <li><a href="<%=request.getContextPath()%>/wsdm_operations_perspective?resourceId=${resourceId}""><span>Operations</span></a></li>
- <li><a href="<%=request.getContextPath()%>/wsdm_wsdl_perspective?resourceId=${resourceId}""><span>WSDL</span></a></li>
- <li><a href="<%=request.getContextPath()%>/wsdm_rmd_perspective?resourceId=${resourceId}""><span>RDM</span></a></li>
- </ul>
- </div>
- </td>
- </tr>
- <tr>
- <td valign="top">
- <div class="panel" align="left" style="height:500px; width=200px; overflow-y:auto; font-size: smaller; font-weight:bold;">
- <pre> <c:out value="${rmd}" /> </pre>
- </div>
- </td>
- </tr>
- </table>
- </span>
- </div>
- </div>
- </div>
- </div>
- </body>
-</html>
\ 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. + +--> + +<%@ 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"%> +<html> + <head> + <link rel="stylesheet" href="<%=request.getContextPath()%>/images/style.css" type="text/css" /> + <title>QMan Administration Console</title> + </head> + <body> + <div id="page" align="center"> + <jsp:include page="/fragments/header.jsp"> + <jsp:param name="title" value="Resource Management - WS-DM RMD Perspective"/> + </jsp:include> + + <div id="content" align="center"> + <jsp:include page="/fragments/menu.jsp"/> + + <div id="contenttext"> + <div id="wsdmmenu" align="left"> + <ul> + <li><a href="<%=request.getContextPath()%>/jmx_perspective?resourceId=${resourceId}"><span>JMX</span></a></li> + <li><a href="<%=request.getContextPath()%>/wsdm_properties_perspective?wsresourceId=${resourceId}"><span>WS-DM</span></a></li> + </ul> + </div> + <br /> + <div class="panel" align="justify"> + <span class="bodytext"> + <table width="100%"> + <tr> + <td valign="top" colspan="2"> + <fieldset> + <legend>Resource ID</legend> + <ul> + <c:forEach var="property" items="${nameAttributes}"> + <li> + <c:out value="${property}"/> + </li> + </c:forEach> + </ul> + </fieldset> + </td> + </tr> + <tr> + <td valign="top"> + <div id="wsdmmenu" align="left" style="font-size: small;"> + <ul> + <li><a href="<%=request.getContextPath()%>/wsdm_properties_perspective?resourceId=${resourceId}"><span>Properties</span></a></li> + <li><a href="<%=request.getContextPath()%>/wsdm_operations_perspective?resourceId=${resourceId}""><span>Operations</span></a></li> + <li><a href="<%=request.getContextPath()%>/wsdm_wsdl_perspective?resourceId=${resourceId}""><span>WSDL</span></a></li> + <li><a href="<%=request.getContextPath()%>/wsdm_rmd_perspective?resourceId=${resourceId}""><span>RDM</span></a></li> + </ul> + </div> + </td> + </tr> + <tr> + <td valign="top"> + <div class="panel" align="left" style="height:500px; width=200px; overflow-y:auto; font-size: smaller; font-weight:bold;"> + <pre> <c:out value="${rmd}" /> </pre> + </div> + </td> + </tr> + </table> + </span> + </div> + </div> + </div> + </div> + </body> +</html> diff --git a/qpid/java/management/client/console/wsdm_wsdl_perspective.jsp b/qpid/java/management/client/console/wsdm_wsdl_perspective.jsp index 3759459842..0674c51a97 100644 --- a/qpid/java/management/client/console/wsdm_wsdl_perspective.jsp +++ b/qpid/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"%>
-<html>
- <head>
- <link rel="stylesheet" href="<%=request.getContextPath()%>/images/style.css" type="text/css" />
- <title>QMan Administration Console</title>
- </head>
- <body>
- <div id="page" align="center">
- <jsp:include page="/fragments/header.jsp">
- <jsp:param name="title" value="Resource Management - WS-DM WSDL Perspective"/>
- </jsp:include>
-
- <div id="content" align="center">
- <jsp:include page="/fragments/menu.jsp"/>
-
- <div id="contenttext">
- <div id="wsdmmenu" align="left">
- <ul>
- <li><a href="<%=request.getContextPath()%>/jmx_perspective?resourceId=${resourceId}"><span>JMX</span></a></li>
- <li><a href="<%=request.getContextPath()%>/wsdm_properties_perspective?resourceId=${resourceId}"><span>WS-DM</span></a></li>
- </ul>
- </div>
- <br />
- <div class="panel" align="justify">
- <span class="bodytext">
- <table width="100%">
- <tr>
- <td valign="top" colspan="2">
- <fieldset>
- <legend>Resource ID</legend>
- <ul>
- <c:forEach var="property" items="${nameAttributes}">
- <li style="color : black;">
- <c:out value="${property}"/>
- </li>
- </c:forEach>
- </ul>
- </fieldset>
- </td>
- </tr>
- <tr>
- <td valign="top">
- <div id="wsdmmenu" align="left" style="font-size: small;">
- <ul>
- <li><a href="<%=request.getContextPath()%>/wsdm_properties_perspective?resourceId=${resourceId}"><span>Properties</span></a></li>
- <li><a href="<%=request.getContextPath()%>/wsdm_operations_perspective?resourceId=${resourceId}""><span>Operations</span></a></li>
- <li><a href="<%=request.getContextPath()%>/wsdm_wsdl_perspective?resourceId=${resourceId}""><span>WSDL</span></a></li>
- <li><a href="<%=request.getContextPath()%>/wsdm_rmd_perspective?resourceId=${resourceId}""><span>RDM</span></a></li>
- </ul>
- </div>
- </td>
- </tr>
- <tr>
- <td valign="top">
- <div class="panel" align="left" style="height:500px; width=200px; overflow-y:auto; font-size: smaller; font-weight:bold;">
- <pre> <c:out value="${wsdl}" /> </pre>
- </div>
- </td>
- </tr>
- </table>
- </span>
- </div>
- </div>
- </div>
- </div>
- </body>
-</html>
\ 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. + +--> + +<%@ 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"%> +<html> + <head> + <link rel="stylesheet" href="<%=request.getContextPath()%>/images/style.css" type="text/css" /> + <title>QMan Administration Console</title> + </head> + <body> + <div id="page" align="center"> + <jsp:include page="/fragments/header.jsp"> + <jsp:param name="title" value="Resource Management - WS-DM WSDL Perspective"/> + </jsp:include> + + <div id="content" align="center"> + <jsp:include page="/fragments/menu.jsp"/> + + <div id="contenttext"> + <div id="wsdmmenu" align="left"> + <ul> + <li><a href="<%=request.getContextPath()%>/jmx_perspective?resourceId=${resourceId}"><span>JMX</span></a></li> + <li><a href="<%=request.getContextPath()%>/wsdm_properties_perspective?resourceId=${resourceId}"><span>WS-DM</span></a></li> + </ul> + </div> + <br /> + <div class="panel" align="justify"> + <span class="bodytext"> + <table width="100%"> + <tr> + <td valign="top" colspan="2"> + <fieldset> + <legend>Resource ID</legend> + <ul> + <c:forEach var="property" items="${nameAttributes}"> + <li style="color : black;"> + <c:out value="${property}"/> + </li> + </c:forEach> + </ul> + </fieldset> + </td> + </tr> + <tr> + <td valign="top"> + <div id="wsdmmenu" align="left" style="font-size: small;"> + <ul> + <li><a href="<%=request.getContextPath()%>/wsdm_properties_perspective?resourceId=${resourceId}"><span>Properties</span></a></li> + <li><a href="<%=request.getContextPath()%>/wsdm_operations_perspective?resourceId=${resourceId}""><span>Operations</span></a></li> + <li><a href="<%=request.getContextPath()%>/wsdm_wsdl_perspective?resourceId=${resourceId}""><span>WSDL</span></a></li> + <li><a href="<%=request.getContextPath()%>/wsdm_rmd_perspective?resourceId=${resourceId}""><span>RDM</span></a></li> + </ul> + </div> + </td> + </tr> + <tr> + <td valign="top"> + <div class="panel" align="left" style="height:500px; width=200px; overflow-y:auto; font-size: smaller; font-weight:bold;"> + <pre> <c:out value="${wsdl}" /> </pre> + </div> + </td> + </tr> + </table> + </span> + </div> + </div> + </div> + </div> + </body> +</html> diff --git a/qpid/java/management/client/etc/jetty.xml b/qpid/java/management/client/etc/jetty.xml index 38a4775641..975053a518 100644 --- a/qpid/java/management/client/etc/jetty.xml +++ b/qpid/java/management/client/etc/jetty.xml @@ -1,4 +1,25 @@ <?xml version="1.0"?> +<!-- + + 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. + +--> + <!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd"> <Configure id="Server" class="org.mortbay.jetty.Server"> <Set name="StopAtShutdown">true</Set> @@ -23,4 +44,4 @@ <Set name="war"><SystemProperty name="QMAN_HOME" default=".." />/app/qman</Set> </New> </Set> -</Configure>
\ No newline at end of file +</Configure> diff --git a/qpid/java/management/client/etc/log4j.xml b/qpid/java/management/client/etc/log4j.xml index 0b63512211..14ee3b2441 100644 --- a/qpid/java/management/client/etc/log4j.xml +++ b/qpid/java/management/client/etc/log4j.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> + <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> @@ -62,15 +83,15 @@ <category name="org.apache.qpid.qman.debug.XmlDebugger"> <priority value="INFO" /> <appender-ref ref="MESSAGES_LOG" /> - </category>
+ </category> - <category name="org.apache.qpid.qman.debug.WsdlDebugger">
- <priority value="INFO" />
- <appender-ref ref="MESSAGES_LOG" />
+ <category name="org.apache.qpid.qman.debug.WsdlDebugger"> + <priority value="INFO" /> + <appender-ref ref="MESSAGES_LOG" /> </category> -
+ <root> <priority value="ERROR" /> </root> -</log4j:configuration>
\ No newline at end of file +</log4j:configuration> diff --git a/qpid/java/management/client/src/main/java/muse.xml b/qpid/java/management/client/src/main/java/muse.xml index cf651c34ac..29a1c02e0c 100644 --- a/qpid/java/management/client/src/main/java/muse.xml +++ b/qpid/java/management/client/src/main/java/muse.xml @@ -1,188 +1,209 @@ -<?xml version="1.0" encoding="UTF-8" ?>
-<muse xmlns="http://ws.apache.org/muse/descriptor"
- xmlns:wsrf-sgw="http://docs.oasis-open.org/wsrf/sgw-2"
- xmlns:qman="http://amqp.apache.org/qpid/management/qman"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://ws.apache.org/muse/descriptor muse-descriptor.xsd">
- <custom-serializer>
- <java-serializable-type>java.lang.Object</java-serializable-type>
- <java-serializer-class>org.apache.qpid.management.wsdm.muse.serializer.ObjectSerializer</java-serializer-class>
- </custom-serializer>
- <custom-serializer>
- <java-serializable-type>java.util.Map</java-serializable-type>
- <java-serializer-class>org.apache.qpid.management.wsdm.muse.serializer.MapSerializer</java-serializer-class>
- </custom-serializer>
- <custom-serializer>
- <java-serializable-type>java.util.HashMap</java-serializable-type>
- <java-serializer-class>org.apache.qpid.management.wsdm.muse.serializer.MapSerializer</java-serializer-class>
- </custom-serializer>
- <custom-serializer>
- <java-serializable-type>java.util.UUID</java-serializable-type>
- <java-serializer-class>org.apache.qpid.management.wsdm.muse.serializer.UUIDSerializer</java-serializer-class>
- </custom-serializer>
- <custom-serializer>
- <java-serializable-type>org.apache.qpid.management.wsdm.capabilities.Result</java-serializable-type>
- <java-serializer-class>org.apache.qpid.management.wsdm.muse.serializer.InvocationResultSerializer</java-serializer-class>
- </custom-serializer>
- <custom-serializer>
- <java-serializable-type>java.util.Date</java-serializable-type>
- <java-serializer-class>org.apache.qpid.management.wsdm.muse.serializer.DateSerializer</java-serializer-class>
- </custom-serializer>
- <router>
- <java-router-class>org.apache.muse.ws.resource.impl.WsResourceRouter</java-router-class>
- <logging>
- <log-file>log/muse.log</log-file>
- <log-level>SEVERE</log-level>
- </logging>
- <persistence>
- <java-persistence-class>org.apache.muse.core.routing.RouterFilePersistence</java-persistence-class>
- <persistence-location>router-entries</persistence-location>
- </persistence>
- </router>
- <resource-type use-router-persistence="true">
- <context-path>consumer</context-path>
- <wsdl>
- <wsdl-file>wsdl/WS-BaseNotification-1_3.wsdl</wsdl-file>
- <wsdl-port-type xmlns:wsntw="http://docs.oasis-open.org/wsn/bw-2">wsntw:NotificationConsumer</wsdl-port-type>
- </wsdl>
- <java-id-factory-class>org.apache.qpid.management.wsdm.common.QManResourceIdFactory</java-id-factory-class>
- <java-resource-class>org.apache.muse.core.SimpleResource</java-resource-class>
- <capability>
- <capability-uri>http://docs.oasis-open.org/wsn/bw-2/NotificationConsumer</capability-uri>
- <java-capability-class>org.apache.muse.ws.notification.impl.SimpleNotificationConsumer</java-capability-class>
- </capability>
- <capability>
- <capability-uri>http://amqp.apache.org/qpid/management/qman/consumer</capability-uri>
- <java-capability-class>org.apache.qpid.management.wsdm.capabilities.ConsumerCapability</java-capability-class>
- </capability>
- </resource-type>
- <resource-type>
- <context-path>SubscriptionManager</context-path>
- <wsdl>
- <wsdl-file>wsdl/WS-BaseNotification-1_3.wsdl</wsdl-file>
- <wsdl-port-type xmlns:wsntw="http://docs.oasis-open.org/wsn/bw-2">wsntw:SubscriptionManager</wsdl-port-type>
- </wsdl>
- <java-id-factory-class>org.apache.qpid.management.wsdm.common.QManResourceIdFactory</java-id-factory-class>
- <java-resource-class>org.apache.muse.ws.resource.impl.SimpleWsResource</java-resource-class>
- <capability>
- <capability-uri>http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata</capability-uri>
- <java-capability-class>org.apache.muse.ws.metadata.impl.SimpleMetadataExchange</java-capability-class>
- </capability>
- <capability>
- <capability-uri>http://docs.oasis-open.org/wsrf/rpw-2/Get</capability-uri>
- <java-capability-class>org.apache.muse.ws.resource.properties.get.impl.SimpleGetCapability</java-capability-class>
- </capability>
- <capability>
- <capability-uri>http://docs.oasis-open.org/wsn/bw-2/SubscriptionManager</capability-uri>
- <java-capability-class>org.apache.muse.ws.notification.impl.SimpleSubscriptionManager</java-capability-class>
- <init-param>
- <param-name>trace-notifications</param-name>
- <param-value>true</param-value>
- </init-param>
- </capability>
- <capability>
- <capability-uri>http://docs.oasis-open.org/wsrf/rlw-2/ImmediateResourceTermination</capability-uri>
- <java-capability-class>org.apache.muse.ws.resource.lifetime.impl.SimpleImmediateTermination</java-capability-class>
- </capability>
- <capability>
- <capability-uri>http://docs.oasis-open.org/wsrf/rlw-2/ScheduledResourceTermination</capability-uri>
- <java-capability-class>org.apache.muse.ws.resource.lifetime.impl.SimpleScheduledTermination</java-capability-class>
- </capability>
- <init-param>
- <param-name>validate-wsrp-schema</param-name>
- <param-value>false</param-value>
- </init-param>
- </resource-type>
- <resource-type use-router-persistence="true">
- <context-path>adapter</context-path>
- <wsdl>
- <wsdl-file>wsdl/QManAdapter.wsdl</wsdl-file>
- <wsdl-port-type xmlns:qman="http://amqp.apache.org/qpid/management/qman">qman:QManAdapterPortType</wsdl-port-type>
- </wsdl>
- <java-id-factory-class>org.apache.qpid.management.wsdm.common.QManResourceIdFactory</java-id-factory-class>
- <java-resource-class>org.apache.muse.ws.resource.impl.SimpleWsResource</java-resource-class>
- <capability>
- <capability-uri >http://amqp.apache.org/qpid/management/qman</capability-uri>
- <java-capability-class>org.apache.qpid.management.wsdm.capabilities.QManAdapterCapability</java-capability-class>
- </capability>
- <capability>
- <capability-uri>http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata</capability-uri>
- <java-capability-class>org.apache.muse.ws.metadata.impl.SimpleMetadataExchange</java-capability-class>
- </capability>
- <capability>
- <capability-uri>http://docs.oasis-open.org/wsrf/rpw-2/Get</capability-uri>
- <java-capability-class>org.apache.muse.ws.resource.properties.get.impl.SimpleGetCapability</java-capability-class>
- </capability>
- <capability>
- <capability-uri>http://docs.oasis-open.org/wsrf/rpw-2/Query</capability-uri>
- <java-capability-class>org.apache.muse.ws.resource.properties.query.impl.SimpleQueryCapability</java-capability-class>
- </capability>
- <capability>
- <capability-uri>http://docs.oasis-open.org/wsrf/sgw-2/ServiceGroup</capability-uri>
- <java-capability-class>org.apache.muse.ws.resource.sg.impl.SimpleServiceGroup</java-capability-class>
- </capability>
- <capability>
- <capability-uri>http://docs.oasis-open.org/wsn/bw-2/NotificationProducer</capability-uri>
- <java-capability-class>org.apache.muse.ws.notification.impl.SimpleNotificationProducer</java-capability-class>
- </capability>
- <init-param>
- <param-name>validate-wsrp-schema</param-name>
- <param-value>false</param-value>
- </init-param>
- </resource-type>
- <resource-type>
- <context-path>QManWsResource</context-path>
- <wsdl>
- <!-- Note that this is not a complete WSDL. It is just a base template where resource specific capabilities wll be added. -->
- <wsdl-file>wsdl/QManWsResource.wsdl</wsdl-file>
- <wsdl-port-type xmlns:qman="http://amqp.apache.org/qpid/management/qman">qman:QManWsResourcePortType</wsdl-port-type>
- </wsdl>
- <java-id-factory-class>org.apache.qpid.management.wsdm.common.ObjectNameIdFactory</java-id-factory-class>
- <java-resource-class>org.apache.qpid.management.wsdm.muse.resources.QManWsResource</java-resource-class>
- <capability>
- <capability-uri>http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata</capability-uri>
- <java-capability-class>org.apache.qpid.management.wsdm.capabilities.QManMetadataExchangeCapability</java-capability-class>
- </capability>
- <capability>
- <capability-uri>http://docs.oasis-open.org/wsrf/rpw-2/Get</capability-uri>
- <java-capability-class>org.apache.muse.ws.resource.properties.get.impl.SimpleGetCapability</java-capability-class>
- </capability>
- <capability>
- <capability-uri>http://docs.oasis-open.org/wsrf/rpw-2/Query</capability-uri>
- <java-capability-class>org.apache.muse.ws.resource.properties.query.impl.SimpleQueryCapability</java-capability-class>
- </capability>
- <capability>
- <capability-uri>http://docs.oasis-open.org/wsrf/rpw-2/Set</capability-uri>
- <java-capability-class>org.apache.muse.ws.resource.properties.set.impl.SimpleSetCapability</java-capability-class>
- </capability>
- <capability>
- <capability-uri>http://docs.oasis-open.org/wsrf/rpw-2/Put</capability-uri>
- <java-capability-class>org.apache.muse.ws.resource.properties.set.impl.SimpleSetCapability</java-capability-class>
- </capability>
- </resource-type>
- <resource-type>
- <context-path>ServiceGroupEntry</context-path>
- <wsdl>
- <wsdl-file>/wsdl/WS-ServiceGroupEntry-1_2.wsdl</wsdl-file>
- <wsdl-port-type>wsrf-sgw:ServiceGroupEntryPortType</wsdl-port-type>
- </wsdl>
- <java-id-factory-class>org.apache.qpid.management.wsdm.common.QManResourceIdFactory</java-id-factory-class>
- <java-resource-class>org.apache.muse.ws.resource.impl.SimpleWsResource</java-resource-class>
- <capability>
- <capability-uri>http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata</capability-uri>
- <java-capability-class>org.apache.muse.ws.metadata.impl.SimpleMetadataExchange</java-capability-class>
- </capability>
- <capability>
- <capability-uri>http://docs.oasis-open.org/wsrf/rpw-2/Get</capability-uri>
- <java-capability-class>org.apache.muse.ws.resource.properties.get.impl.SimpleGetCapability</java-capability-class>
- </capability>
- <capability>
- <capability-uri>http://docs.oasis-open.org/wsrf/sgw-2/ServiceGroupEntry</capability-uri>
- <java-capability-class>org.apache.muse.ws.resource.sg.impl.SimpleEntry</java-capability-class>
- </capability>
- <init-param>
- <param-name>validate-wsrp-schema</param-name>
- <param-value>false</param-value>
- </init-param>
- </resource-type>
-</muse>
\ No newline at end of file +<?xml version="1.0" encoding="UTF-8" ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> + +<muse xmlns="http://ws.apache.org/muse/descriptor" + xmlns:wsrf-sgw="http://docs.oasis-open.org/wsrf/sgw-2" + xmlns:qman="http://amqp.apache.org/qpid/management/qman" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://ws.apache.org/muse/descriptor muse-descriptor.xsd"> + <custom-serializer> + <java-serializable-type>java.lang.Object</java-serializable-type> + <java-serializer-class>org.apache.qpid.management.wsdm.muse.serializer.ObjectSerializer</java-serializer-class> + </custom-serializer> + <custom-serializer> + <java-serializable-type>java.util.Map</java-serializable-type> + <java-serializer-class>org.apache.qpid.management.wsdm.muse.serializer.MapSerializer</java-serializer-class> + </custom-serializer> + <custom-serializer> + <java-serializable-type>java.util.HashMap</java-serializable-type> + <java-serializer-class>org.apache.qpid.management.wsdm.muse.serializer.MapSerializer</java-serializer-class> + </custom-serializer> + <custom-serializer> + <java-serializable-type>java.util.UUID</java-serializable-type> + <java-serializer-class>org.apache.qpid.management.wsdm.muse.serializer.UUIDSerializer</java-serializer-class> + </custom-serializer> + <custom-serializer> + <java-serializable-type>org.apache.qpid.management.wsdm.capabilities.Result</java-serializable-type> + <java-serializer-class>org.apache.qpid.management.wsdm.muse.serializer.InvocationResultSerializer</java-serializer-class> + </custom-serializer> + <custom-serializer> + <java-serializable-type>java.util.Date</java-serializable-type> + <java-serializer-class>org.apache.qpid.management.wsdm.muse.serializer.DateSerializer</java-serializer-class> + </custom-serializer> + <router> + <java-router-class>org.apache.muse.ws.resource.impl.WsResourceRouter</java-router-class> + <logging> + <log-file>log/muse.log</log-file> + <log-level>SEVERE</log-level> + </logging> + <persistence> + <java-persistence-class>org.apache.muse.core.routing.RouterFilePersistence</java-persistence-class> + <persistence-location>router-entries</persistence-location> + </persistence> + </router> + <resource-type use-router-persistence="true"> + <context-path>consumer</context-path> + <wsdl> + <wsdl-file>wsdl/WS-BaseNotification-1_3.wsdl</wsdl-file> + <wsdl-port-type xmlns:wsntw="http://docs.oasis-open.org/wsn/bw-2">wsntw:NotificationConsumer</wsdl-port-type> + </wsdl> + <java-id-factory-class>org.apache.qpid.management.wsdm.common.QManResourceIdFactory</java-id-factory-class> + <java-resource-class>org.apache.muse.core.SimpleResource</java-resource-class> + <capability> + <capability-uri>http://docs.oasis-open.org/wsn/bw-2/NotificationConsumer</capability-uri> + <java-capability-class>org.apache.muse.ws.notification.impl.SimpleNotificationConsumer</java-capability-class> + </capability> + <capability> + <capability-uri>http://amqp.apache.org/qpid/management/qman/consumer</capability-uri> + <java-capability-class>org.apache.qpid.management.wsdm.capabilities.ConsumerCapability</java-capability-class> + </capability> + </resource-type> + <resource-type> + <context-path>SubscriptionManager</context-path> + <wsdl> + <wsdl-file>wsdl/WS-BaseNotification-1_3.wsdl</wsdl-file> + <wsdl-port-type xmlns:wsntw="http://docs.oasis-open.org/wsn/bw-2">wsntw:SubscriptionManager</wsdl-port-type> + </wsdl> + <java-id-factory-class>org.apache.qpid.management.wsdm.common.QManResourceIdFactory</java-id-factory-class> + <java-resource-class>org.apache.muse.ws.resource.impl.SimpleWsResource</java-resource-class> + <capability> + <capability-uri>http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata</capability-uri> + <java-capability-class>org.apache.muse.ws.metadata.impl.SimpleMetadataExchange</java-capability-class> + </capability> + <capability> + <capability-uri>http://docs.oasis-open.org/wsrf/rpw-2/Get</capability-uri> + <java-capability-class>org.apache.muse.ws.resource.properties.get.impl.SimpleGetCapability</java-capability-class> + </capability> + <capability> + <capability-uri>http://docs.oasis-open.org/wsn/bw-2/SubscriptionManager</capability-uri> + <java-capability-class>org.apache.muse.ws.notification.impl.SimpleSubscriptionManager</java-capability-class> + <init-param> + <param-name>trace-notifications</param-name> + <param-value>true</param-value> + </init-param> + </capability> + <capability> + <capability-uri>http://docs.oasis-open.org/wsrf/rlw-2/ImmediateResourceTermination</capability-uri> + <java-capability-class>org.apache.muse.ws.resource.lifetime.impl.SimpleImmediateTermination</java-capability-class> + </capability> + <capability> + <capability-uri>http://docs.oasis-open.org/wsrf/rlw-2/ScheduledResourceTermination</capability-uri> + <java-capability-class>org.apache.muse.ws.resource.lifetime.impl.SimpleScheduledTermination</java-capability-class> + </capability> + <init-param> + <param-name>validate-wsrp-schema</param-name> + <param-value>false</param-value> + </init-param> + </resource-type> + <resource-type use-router-persistence="true"> + <context-path>adapter</context-path> + <wsdl> + <wsdl-file>wsdl/QManAdapter.wsdl</wsdl-file> + <wsdl-port-type xmlns:qman="http://amqp.apache.org/qpid/management/qman">qman:QManAdapterPortType</wsdl-port-type> + </wsdl> + <java-id-factory-class>org.apache.qpid.management.wsdm.common.QManResourceIdFactory</java-id-factory-class> + <java-resource-class>org.apache.muse.ws.resource.impl.SimpleWsResource</java-resource-class> + <capability> + <capability-uri >http://amqp.apache.org/qpid/management/qman</capability-uri> + <java-capability-class>org.apache.qpid.management.wsdm.capabilities.QManAdapterCapability</java-capability-class> + </capability> + <capability> + <capability-uri>http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata</capability-uri> + <java-capability-class>org.apache.muse.ws.metadata.impl.SimpleMetadataExchange</java-capability-class> + </capability> + <capability> + <capability-uri>http://docs.oasis-open.org/wsrf/rpw-2/Get</capability-uri> + <java-capability-class>org.apache.muse.ws.resource.properties.get.impl.SimpleGetCapability</java-capability-class> + </capability> + <capability> + <capability-uri>http://docs.oasis-open.org/wsrf/rpw-2/Query</capability-uri> + <java-capability-class>org.apache.muse.ws.resource.properties.query.impl.SimpleQueryCapability</java-capability-class> + </capability> + <capability> + <capability-uri>http://docs.oasis-open.org/wsrf/sgw-2/ServiceGroup</capability-uri> + <java-capability-class>org.apache.muse.ws.resource.sg.impl.SimpleServiceGroup</java-capability-class> + </capability> + <capability> + <capability-uri>http://docs.oasis-open.org/wsn/bw-2/NotificationProducer</capability-uri> + <java-capability-class>org.apache.muse.ws.notification.impl.SimpleNotificationProducer</java-capability-class> + </capability> + <init-param> + <param-name>validate-wsrp-schema</param-name> + <param-value>false</param-value> + </init-param> + </resource-type> + <resource-type> + <context-path>QManWsResource</context-path> + <wsdl> + <!-- Note that this is not a complete WSDL. It is just a base template where resource specific capabilities wll be added. --> + <wsdl-file>wsdl/QManWsResource.wsdl</wsdl-file> + <wsdl-port-type xmlns:qman="http://amqp.apache.org/qpid/management/qman">qman:QManWsResourcePortType</wsdl-port-type> + </wsdl> + <java-id-factory-class>org.apache.qpid.management.wsdm.common.ObjectNameIdFactory</java-id-factory-class> + <java-resource-class>org.apache.qpid.management.wsdm.muse.resources.QManWsResource</java-resource-class> + <capability> + <capability-uri>http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata</capability-uri> + <java-capability-class>org.apache.qpid.management.wsdm.capabilities.QManMetadataExchangeCapability</java-capability-class> + </capability> + <capability> + <capability-uri>http://docs.oasis-open.org/wsrf/rpw-2/Get</capability-uri> + <java-capability-class>org.apache.muse.ws.resource.properties.get.impl.SimpleGetCapability</java-capability-class> + </capability> + <capability> + <capability-uri>http://docs.oasis-open.org/wsrf/rpw-2/Query</capability-uri> + <java-capability-class>org.apache.muse.ws.resource.properties.query.impl.SimpleQueryCapability</java-capability-class> + </capability> + <capability> + <capability-uri>http://docs.oasis-open.org/wsrf/rpw-2/Set</capability-uri> + <java-capability-class>org.apache.muse.ws.resource.properties.set.impl.SimpleSetCapability</java-capability-class> + </capability> + <capability> + <capability-uri>http://docs.oasis-open.org/wsrf/rpw-2/Put</capability-uri> + <java-capability-class>org.apache.muse.ws.resource.properties.set.impl.SimpleSetCapability</java-capability-class> + </capability> + </resource-type> + <resource-type> + <context-path>ServiceGroupEntry</context-path> + <wsdl> + <wsdl-file>/wsdl/WS-ServiceGroupEntry-1_2.wsdl</wsdl-file> + <wsdl-port-type>wsrf-sgw:ServiceGroupEntryPortType</wsdl-port-type> + </wsdl> + <java-id-factory-class>org.apache.qpid.management.wsdm.common.QManResourceIdFactory</java-id-factory-class> + <java-resource-class>org.apache.muse.ws.resource.impl.SimpleWsResource</java-resource-class> + <capability> + <capability-uri>http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata</capability-uri> + <java-capability-class>org.apache.muse.ws.metadata.impl.SimpleMetadataExchange</java-capability-class> + </capability> + <capability> + <capability-uri>http://docs.oasis-open.org/wsrf/rpw-2/Get</capability-uri> + <java-capability-class>org.apache.muse.ws.resource.properties.get.impl.SimpleGetCapability</java-capability-class> + </capability> + <capability> + <capability-uri>http://docs.oasis-open.org/wsrf/sgw-2/ServiceGroupEntry</capability-uri> + <java-capability-class>org.apache.muse.ws.resource.sg.impl.SimpleEntry</java-capability-class> + </capability> + <init-param> + <param-name>validate-wsrp-schema</param-name> + <param-value>false</param-value> + </init-param> + </resource-type> +</muse> diff --git a/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidEntity.java b/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidEntity.java index a13da559fc..ea0acb5fd1 100644 --- a/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidEntity.java +++ b/qpid/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<String,Object> _attributes = new HashMap<String, Object>();
-
- /**
- * 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<String,Object> _attributes = new HashMap<String, Object>(); + + /** + * 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/qpid/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/engine/WSDMAdapterEnvironment.java b/qpid/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/engine/WSDMAdapterEnvironment.java index b5d978e0e5..e4d0f25adc 100644 --- a/qpid/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/engine/WSDMAdapterEnvironment.java +++ b/qpid/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/qpid/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/engine/WSDMAdapterIsolationLayer.java b/qpid/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/engine/WSDMAdapterIsolationLayer.java index 0ca19bc727..e9a74bf60c 100644 --- a/qpid/java/management/client/src/main/java/org/apache/qpid/management/wsdm/muse/engine/WSDMAdapterIsolationLayer.java +++ b/qpid/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/qpid/java/management/client/src/main/java/router-entries/adapter/resource-instance-1.xml b/qpid/java/management/client/src/main/java/router-entries/adapter/resource-instance-1.xml index f7d72c2903..062791fa3f 100644 --- a/qpid/java/management/client/src/main/java/router-entries/adapter/resource-instance-1.xml +++ b/qpid/java/management/client/src/main/java/router-entries/adapter/resource-instance-1.xml @@ -1,2 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> + <wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing"/> diff --git a/qpid/java/management/client/src/main/java/router-entries/consumer/resource-instance-1.xml b/qpid/java/management/client/src/main/java/router-entries/consumer/resource-instance-1.xml index 599ac87a57..062791fa3f 100644 --- a/qpid/java/management/client/src/main/java/router-entries/consumer/resource-instance-1.xml +++ b/qpid/java/management/client/src/main/java/router-entries/consumer/resource-instance-1.xml @@ -1,2 +1,23 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing"/>
\ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> + +<wsa:ReferenceParameters xmlns:wsa="http://www.w3.org/2005/08/addressing"/> diff --git a/qpid/java/management/client/src/main/java/wsdl/SOAP-Envelope-1_2.xsd b/qpid/java/management/client/src/main/java/wsdl/SOAP-Envelope-1_2.xsd index 5aba6591fe..ab38b1b7f2 100644 --- a/qpid/java/management/client/src/main/java/wsdl/SOAP-Envelope-1_2.xsd +++ b/qpid/java/management/client/src/main/java/wsdl/SOAP-Envelope-1_2.xsd @@ -1,160 +1,181 @@ -<?xml version="1.0"?>
-
-<!-- Schema defined in the SOAP Version 1.2 Part 1 specification
- Proposed Recommendation:
- http://www.w3.org/TR/2003/PR-soap12-part1-20030507/
- $Id: SOAP-Envelope-1_2.xsd,v 1.1 2006/05/07 19:09:15 danjemiolo Exp $
-
- Copyright (C)2003 W3C(R) (MIT, ERCIM, Keio), All Rights Reserved.
- W3C viability, trademark, document use and software licensing rules
- apply.
- http://www.w3.org/Consortium/Legal/
-
- This document is governed by the W3C Software License [1] as
- described in the FAQ [2].
-
- [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
- [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
--->
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.w3.org/2003/05/soap-envelope"
- targetNamespace="http://www.w3.org/2003/05/soap-envelope"
- elementFormDefault="qualified">
-
- <xs:import namespace="http://www.w3.org/XML/1998/namespace"
- schemaLocation="XML-Namespace-1998.xsd"/>
-
- <!-- Envelope, header and body -->
- <xs:element name="Envelope" type="tns:Envelope"/>
- <xs:complexType name="Envelope">
- <xs:sequence>
- <xs:element ref="tns:Header" minOccurs="0"/>
- <xs:element ref="tns:Body" minOccurs="1"/>
- </xs:sequence>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
-
- <xs:element name="Header" type="tns:Header"/>
- <xs:complexType name="Header">
- <xs:annotation>
- <xs:documentation>
- Elements replacing the wildcard MUST be namespace qualified, but can be in the targetNamespace
- </xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
-
- <xs:element name="Body" type="tns:Body"/>
- <xs:complexType name="Body">
- <xs:sequence>
- <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
-
- <!-- Global Attributes. The following attributes are intended to be
- usable via qualified attribute names on any complex type referencing
- them. -->
- <xs:attribute name="mustUnderstand" type="xs:boolean" default="0"/>
- <xs:attribute name="relay" type="xs:boolean" default="0"/>
- <xs:attribute name="role" type="xs:anyURI"/>
-
- <!-- 'encodingStyle' indicates any canonicalization conventions
- followed in the contents of the containing element. For example, the
- value 'http://www.w3.org/2003/05/soap-encoding' indicates the pattern
- described in the last call working draft of SOAP Version 1.2 Part 2:
- Adjuncts -->
-
- <xs:attribute name="encodingStyle" type="xs:anyURI"/>
-
- <xs:element name="Fault" type="tns:Fault"/>
- <xs:complexType name="Fault" final="extension">
- <xs:annotation>
- <xs:documentation>
- Fault reporting structure
- </xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="Code" type="tns:faultcode"/>
- <xs:element name="Reason" type="tns:faultreason"/>
- <xs:element name="Node" type="xs:anyURI" minOccurs="0"/>
- <xs:element name="Role" type="xs:anyURI" minOccurs="0"/>
- <xs:element name="Detail" type="tns:detail" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="faultreason">
- <xs:sequence>
- <xs:element name="Text" type="tns:reasontext"
- minOccurs="1" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="reasontext">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute ref="xml:lang" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:complexType name="faultcode">
- <xs:sequence>
- <xs:element name="Value"
- type="tns:faultcodeEnum"/>
- <xs:element name="Subcode"
- type="tns:subcode"
- minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:simpleType name="faultcodeEnum">
- <xs:restriction base="xs:QName">
- <xs:enumeration value="tns:DataEncodingUnknown"/>
- <xs:enumeration value="tns:MustUnderstand"/>
- <xs:enumeration value="tns:Receiver"/>
- <xs:enumeration value="tns:Sender"/>
- <xs:enumeration value="tns:VersionMismatch"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:complexType name="subcode">
- <xs:sequence>
- <xs:element name="Value"
- type="xs:QName"/>
- <xs:element name="Subcode"
- type="tns:subcode"
- minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="detail">
- <xs:sequence>
- <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:complexType>
-
- <!-- Global element declaration and complex type definition for header entry returned due to a mustUnderstand fault -->
- <xs:element name="NotUnderstood" type="tns:NotUnderstoodType"/>
- <xs:complexType name="NotUnderstoodType">
- <xs:attribute name="qname" type="xs:QName" use="required"/>
- </xs:complexType>
-
- <!-- Global element and associated types for managing version transition as described in Appendix A of the SOAP Version 1.2 Part 1 Last Call Working Draft -->
- <xs:complexType name="SupportedEnvType">
- <xs:attribute name="qname" type="xs:QName" use="required"/>
- </xs:complexType>
-
- <xs:element name="Upgrade" type="tns:UpgradeType"/>
- <xs:complexType name="UpgradeType">
- <xs:sequence>
- <xs:element name="SupportedEnvelope" type="tns:SupportedEnvType" minOccurs="1" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
-</xs:schema>
+<?xml version="1.0"?> +<!-- + + 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. + +--> + + +<!-- Schema defined in the SOAP Version 1.2 Part 1 specification + Proposed Recommendation: + http://www.w3.org/TR/2003/PR-soap12-part1-20030507/ + $Id: SOAP-Envelope-1_2.xsd,v 1.1 2006/05/07 19:09:15 danjemiolo Exp $ + + Copyright (C)2003 W3C(R) (MIT, ERCIM, Keio), All Rights Reserved. + W3C viability, trademark, document use and software licensing rules + apply. + http://www.w3.org/Consortium/Legal/ + + This document is governed by the W3C Software License [1] as + described in the FAQ [2]. + + [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720 + [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD +--> + +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:tns="http://www.w3.org/2003/05/soap-envelope" + targetNamespace="http://www.w3.org/2003/05/soap-envelope" + elementFormDefault="qualified"> + + <xs:import namespace="http://www.w3.org/XML/1998/namespace" + schemaLocation="XML-Namespace-1998.xsd"/> + + <!-- Envelope, header and body --> + <xs:element name="Envelope" type="tns:Envelope"/> + <xs:complexType name="Envelope"> + <xs:sequence> + <xs:element ref="tns:Header" minOccurs="0"/> + <xs:element ref="tns:Body" minOccurs="1"/> + </xs:sequence> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:complexType> + + <xs:element name="Header" type="tns:Header"/> + <xs:complexType name="Header"> + <xs:annotation> + <xs:documentation> + Elements replacing the wildcard MUST be namespace qualified, but can be in the targetNamespace + </xs:documentation> + </xs:annotation> + <xs:sequence> + <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:complexType> + + <xs:element name="Body" type="tns:Body"/> + <xs:complexType name="Body"> + <xs:sequence> + <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:complexType> + + <!-- Global Attributes. The following attributes are intended to be + usable via qualified attribute names on any complex type referencing + them. --> + <xs:attribute name="mustUnderstand" type="xs:boolean" default="0"/> + <xs:attribute name="relay" type="xs:boolean" default="0"/> + <xs:attribute name="role" type="xs:anyURI"/> + + <!-- 'encodingStyle' indicates any canonicalization conventions + followed in the contents of the containing element. For example, the + value 'http://www.w3.org/2003/05/soap-encoding' indicates the pattern + described in the last call working draft of SOAP Version 1.2 Part 2: + Adjuncts --> + + <xs:attribute name="encodingStyle" type="xs:anyURI"/> + + <xs:element name="Fault" type="tns:Fault"/> + <xs:complexType name="Fault" final="extension"> + <xs:annotation> + <xs:documentation> + Fault reporting structure + </xs:documentation> + </xs:annotation> + <xs:sequence> + <xs:element name="Code" type="tns:faultcode"/> + <xs:element name="Reason" type="tns:faultreason"/> + <xs:element name="Node" type="xs:anyURI" minOccurs="0"/> + <xs:element name="Role" type="xs:anyURI" minOccurs="0"/> + <xs:element name="Detail" type="tns:detail" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="faultreason"> + <xs:sequence> + <xs:element name="Text" type="tns:reasontext" + minOccurs="1" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="reasontext"> + <xs:simpleContent> + <xs:extension base="xs:string"> + <xs:attribute ref="xml:lang" use="required"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + + <xs:complexType name="faultcode"> + <xs:sequence> + <xs:element name="Value" + type="tns:faultcodeEnum"/> + <xs:element name="Subcode" + type="tns:subcode" + minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + <xs:simpleType name="faultcodeEnum"> + <xs:restriction base="xs:QName"> + <xs:enumeration value="tns:DataEncodingUnknown"/> + <xs:enumeration value="tns:MustUnderstand"/> + <xs:enumeration value="tns:Receiver"/> + <xs:enumeration value="tns:Sender"/> + <xs:enumeration value="tns:VersionMismatch"/> + </xs:restriction> + </xs:simpleType> + + <xs:complexType name="subcode"> + <xs:sequence> + <xs:element name="Value" + type="xs:QName"/> + <xs:element name="Subcode" + type="tns:subcode" + minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="detail"> + <xs:sequence> + <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:complexType> + + <!-- Global element declaration and complex type definition for header entry returned due to a mustUnderstand fault --> + <xs:element name="NotUnderstood" type="tns:NotUnderstoodType"/> + <xs:complexType name="NotUnderstoodType"> + <xs:attribute name="qname" type="xs:QName" use="required"/> + </xs:complexType> + + <!-- Global element and associated types for managing version transition as described in Appendix A of the SOAP Version 1.2 Part 1 Last Call Working Draft --> + <xs:complexType name="SupportedEnvType"> + <xs:attribute name="qname" type="xs:QName" use="required"/> + </xs:complexType> + + <xs:element name="Upgrade" type="tns:UpgradeType"/> + <xs:complexType name="UpgradeType"> + <xs:sequence> + <xs:element name="SupportedEnvelope" type="tns:SupportedEnvType" minOccurs="1" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + +</xs:schema> diff --git a/qpid/java/management/client/src/main/java/wsdl/WS-Addressing-2005_08.xsd b/qpid/java/management/client/src/main/java/wsdl/WS-Addressing-2005_08.xsd index 9bf9b10b7f..04b4a688b3 100644 --- a/qpid/java/management/client/src/main/java/wsdl/WS-Addressing-2005_08.xsd +++ b/qpid/java/management/client/src/main/java/wsdl/WS-Addressing-2005_08.xsd @@ -1,22 +1,43 @@ <?xml version="1.0" encoding="utf-8"?> -<xs:schema
- targetNamespace="http://www.w3.org/2005/08/addressing"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.w3.org/2005/08/addressing"
- elementFormDefault="qualified"
+<!-- + + 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. + +--> + +<xs:schema + targetNamespace="http://www.w3.org/2005/08/addressing" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:tns="http://www.w3.org/2005/08/addressing" + elementFormDefault="qualified" attributeFormDefault="unqualified"> <!-- Constructs from the WS-Addressing Core --> - <xs:element name="EndpointReference"
+ <xs:element name="EndpointReference" type="tns:EndpointReferenceType" /> <xs:complexType name="EndpointReferenceType" mixed="false"> <xs:sequence> <xs:element name="Address" type="tns:AttributedURIType" /> - <xs:element name="ReferenceParameters"
+ <xs:element name="ReferenceParameters" type="tns:ReferenceParametersType" minOccurs="0" /> <xs:element ref="tns:Metadata" minOccurs="0" /> - <xs:any namespace="##other" processContents="lax"
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" /> </xs:sequence> <xs:anyAttribute namespace="##other" processContents="lax" /> @@ -24,7 +45,7 @@ <xs:complexType name="ReferenceParametersType" mixed="false"> <xs:sequence> - <xs:any namespace="##any" processContents="lax"
+ <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded" /> </xs:sequence> <xs:anyAttribute namespace="##other" processContents="lax" /> @@ -33,7 +54,7 @@ <xs:element name="Metadata" type="tns:MetadataType" /> <xs:complexType name="MetadataType" mixed="false"> <xs:sequence> - <xs:any namespace="##any" processContents="lax"
+ <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded" /> </xs:sequence> <xs:anyAttribute namespace="##other" processContents="lax" /> @@ -44,10 +65,10 @@ <xs:complexType name="RelatesToType" mixed="false"> <xs:simpleContent> <xs:extension base="xs:anyURI"> - <xs:attribute name="RelationshipType"
- type="tns:RelationshipTypeOpenEnum" use="optional"
+ <xs:attribute name="RelationshipType" + type="tns:RelationshipTypeOpenEnum" use="optional" default="http://www.w3.org/2005/08/addressing/reply" /> - <xs:anyAttribute namespace="##other"
+ <xs:anyAttribute namespace="##other" processContents="lax" /> </xs:extension> </xs:simpleContent> @@ -59,7 +80,7 @@ <xs:simpleType name="RelationshipType"> <xs:restriction base="xs:anyURI"> - <xs:enumeration
+ <xs:enumeration value="http://www.w3.org/2005/08/addressing/reply" /> </xs:restriction> </xs:simpleType> @@ -73,7 +94,7 @@ <xs:complexType name="AttributedURIType" mixed="false"> <xs:simpleContent> <xs:extension base="xs:anyURI"> - <xs:anyAttribute namespace="##other"
+ <xs:anyAttribute namespace="##other" processContents="lax" /> </xs:extension> </xs:simpleContent> @@ -107,18 +128,18 @@ <xs:complexType name="AttributedUnsignedLongType" mixed="false"> <xs:simpleContent> <xs:extension base="xs:unsignedLong"> - <xs:anyAttribute namespace="##other"
+ <xs:anyAttribute namespace="##other" processContents="lax" /> </xs:extension> </xs:simpleContent> </xs:complexType> - <xs:element name="ProblemHeaderQName"
+ <xs:element name="ProblemHeaderQName" type="tns:AttributedQNameType" /> <xs:complexType name="AttributedQNameType" mixed="false"> <xs:simpleContent> <xs:extension base="xs:QName"> - <xs:anyAttribute namespace="##other"
+ <xs:anyAttribute namespace="##other" processContents="lax" /> </xs:extension> </xs:simpleContent> @@ -127,7 +148,7 @@ <xs:element name="ProblemHeader" type="tns:AttributedAnyType" /> <xs:complexType name="AttributedAnyType" mixed="false"> <xs:sequence> - <xs:any namespace="##any" processContents="lax"
+ <xs:any namespace="##any" processContents="lax" minOccurs="1" maxOccurs="1" /> </xs:sequence> <xs:anyAttribute namespace="##other" processContents="lax" /> @@ -139,7 +160,7 @@ <xs:complexType name="ProblemActionType" mixed="false"> <xs:sequence> <xs:element ref="tns:Action" minOccurs="0" /> - <xs:element name="SoapAction" minOccurs="0"
+ <xs:element name="SoapAction" minOccurs="0" type="xs:anyURI" /> </xs:sequence> <xs:anyAttribute namespace="##other" processContents="lax" /> diff --git a/qpid/java/management/client/src/main/java/wsdl/WS-MetadataExchange-2004_09.xsd b/qpid/java/management/client/src/main/java/wsdl/WS-MetadataExchange-2004_09.xsd index 771a801f57..4cef35b510 100644 --- a/qpid/java/management/client/src/main/java/wsdl/WS-MetadataExchange-2004_09.xsd +++ b/qpid/java/management/client/src/main/java/wsdl/WS-MetadataExchange-2004_09.xsd @@ -1,113 +1,134 @@ -<?xml version='1.0' encoding='UTF-8' ?>
-<!--
-(c) 2004 BEA Systems Inc., Computer Associates International, Inc.,
-International Business Machines Corporation, Microsoft Corporation,
-Inc., SAP AG, Sun Microsystems, and webMethods. All rights reserved.
-
-Permission to copy and display the WS-MetadataExchange Specification
-(the "Specification"), in any medium without fee or royalty is hereby
-granted, provided that you include the following on ALL copies of the
-Specification that you make:
-
-1. A link or URL to the Specification at this location.
-2. The copyright notice as shown in the Specification.
-
-BEA Systems, Computer Associates, IBM, Microsoft, SAP, Sun, and
-webMethods (collectively, the "Authors") each agree to grant you a
-license, under royalty-free and otherwise reasonable,
-non-discriminatory terms and conditions, to their respective essential
-patent claims that they deem necessary to implement the
-WS-MetadataExchange Specification.
-
-THE SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE
-SPECIFICATION ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE
-IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY
-PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY
-USE OR DISTRIBUTION OF THE SPECIFICATIONS.
-
-The name and trademarks of the Authors may NOT be used in any manner,
-including advertising or publicity pertaining to the Specifications or
-their contents without specific, written prior permission. Title to
-copyright in the Specifications will at all times remain with the
-Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
--->
-
-<xs:schema
- targetNamespace="http://schemas.xmlsoap.org/ws/2004/09/mex"
- xmlns:tns="http://schemas.xmlsoap.org/ws/2004/09/mex"
- xmlns:wsa="http://www.w3.org/2005/08/addressing"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified" >
-
- <xs:import
- namespace="http://www.w3.org/2005/08/addressing"
- schemaLocation="WS-Addressing-2005_08.xsd" />
-
- <!-- Get Metadata request -->
- <xs:element name='GetMetadata' >
- <xs:complexType>
- <xs:sequence>
- <xs:element ref='tns:Dialect' minOccurs='0' />
- <xs:element ref='tns:Identifier' minOccurs='0' />
- </xs:sequence>
- <xs:anyAttribute namespace='##other' processContents='lax' />
- </xs:complexType>
- </xs:element>
-
- <xs:element name='Dialect' type='xs:anyURI' />
- <xs:element name='Identifier' type='xs:anyURI' />
-
- <!-- Get Metadata response -->
- <xs:element name='Metadata' >
- <xs:complexType>
- <xs:sequence>
- <xs:element ref='tns:MetadataSection'
- minOccurs='0'
- maxOccurs='unbounded' />
- </xs:sequence>
- <xs:anyAttribute namespace='##other' processContents='lax' />
- </xs:complexType>
- </xs:element>
-
- <xs:element name='MetadataSection' >
- <xs:complexType>
- <xs:choice>
- <xs:any namespace='##other'
- processContents='lax'
- minOccurs='0'
- maxOccurs='unbounded' />
- <xs:element ref='tns:MetadataReference' />
- <xs:element ref='tns:Location' />
- </xs:choice>
- <xs:attribute name='Dialect' type='xs:anyURI' use='required' />
- <xs:attribute name='Identifier' type='xs:anyURI' />
- <xs:anyAttribute namespace='##other' processContents='lax' />
- </xs:complexType>
- </xs:element>
-
- <xs:element name='MetadataReference'
- type='wsa:EndpointReferenceType' />
-
- <xs:element name='Location'
- type='xs:anyURI' />
-
- <!-- count(/s:Envelope/s:Body/*) = 0 for Get request -->
-
- <!-- Get Response returns xs:any -->
-
- <xs:complexType name='AnyXmlType' >
- <xs:sequence>
- <xs:any namespace='##any' processContents='lax' />
- </xs:sequence>
- <xs:anyAttribute namespace='##any' processContents='lax' />
- </xs:complexType>
-
-</xs:schema>
+<?xml version='1.0' encoding='UTF-8' ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> + +<!-- +(c) 2004 BEA Systems Inc., Computer Associates International, Inc., +International Business Machines Corporation, Microsoft Corporation, +Inc., SAP AG, Sun Microsystems, and webMethods. All rights reserved. + +Permission to copy and display the WS-MetadataExchange Specification +(the "Specification"), in any medium without fee or royalty is hereby +granted, provided that you include the following on ALL copies of the +Specification that you make: + +1. A link or URL to the Specification at this location. +2. The copyright notice as shown in the Specification. + +BEA Systems, Computer Associates, IBM, Microsoft, SAP, Sun, and +webMethods (collectively, the "Authors") each agree to grant you a +license, under royalty-free and otherwise reasonable, +non-discriminatory terms and conditions, to their respective essential +patent claims that they deem necessary to implement the +WS-MetadataExchange Specification. + +THE SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO +REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT +LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE +SPECIFICATION ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE +IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY +PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. + +THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, +INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY +USE OR DISTRIBUTION OF THE SPECIFICATIONS. + +The name and trademarks of the Authors may NOT be used in any manner, +including advertising or publicity pertaining to the Specifications or +their contents without specific, written prior permission. Title to +copyright in the Specifications will at all times remain with the +Authors. + +No other rights are granted by implication, estoppel or otherwise. +--> + +<xs:schema + targetNamespace="http://schemas.xmlsoap.org/ws/2004/09/mex" + xmlns:tns="http://schemas.xmlsoap.org/ws/2004/09/mex" + xmlns:wsa="http://www.w3.org/2005/08/addressing" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" > + + <xs:import + namespace="http://www.w3.org/2005/08/addressing" + schemaLocation="WS-Addressing-2005_08.xsd" /> + + <!-- Get Metadata request --> + <xs:element name='GetMetadata' > + <xs:complexType> + <xs:sequence> + <xs:element ref='tns:Dialect' minOccurs='0' /> + <xs:element ref='tns:Identifier' minOccurs='0' /> + </xs:sequence> + <xs:anyAttribute namespace='##other' processContents='lax' /> + </xs:complexType> + </xs:element> + + <xs:element name='Dialect' type='xs:anyURI' /> + <xs:element name='Identifier' type='xs:anyURI' /> + + <!-- Get Metadata response --> + <xs:element name='Metadata' > + <xs:complexType> + <xs:sequence> + <xs:element ref='tns:MetadataSection' + minOccurs='0' + maxOccurs='unbounded' /> + </xs:sequence> + <xs:anyAttribute namespace='##other' processContents='lax' /> + </xs:complexType> + </xs:element> + + <xs:element name='MetadataSection' > + <xs:complexType> + <xs:choice> + <xs:any namespace='##other' + processContents='lax' + minOccurs='0' + maxOccurs='unbounded' /> + <xs:element ref='tns:MetadataReference' /> + <xs:element ref='tns:Location' /> + </xs:choice> + <xs:attribute name='Dialect' type='xs:anyURI' use='required' /> + <xs:attribute name='Identifier' type='xs:anyURI' /> + <xs:anyAttribute namespace='##other' processContents='lax' /> + </xs:complexType> + </xs:element> + + <xs:element name='MetadataReference' + type='wsa:EndpointReferenceType' /> + + <xs:element name='Location' + type='xs:anyURI' /> + + <!-- count(/s:Envelope/s:Body/*) = 0 for Get request --> + + <!-- Get Response returns xs:any --> + + <xs:complexType name='AnyXmlType' > + <xs:sequence> + <xs:any namespace='##any' processContents='lax' /> + </xs:sequence> + <xs:anyAttribute namespace='##any' processContents='lax' /> + </xs:complexType> + +</xs:schema> diff --git a/qpid/java/management/client/src/main/java/wsdl/WSDM-MUWS-Part1-1_1.xsd b/qpid/java/management/client/src/main/java/wsdl/WSDM-MUWS-Part1-1_1.xsd index dd74c23681..c24e97a9ce 100644 --- a/qpid/java/management/client/src/main/java/wsdl/WSDM-MUWS-Part1-1_1.xsd +++ b/qpid/java/management/client/src/main/java/wsdl/WSDM-MUWS-Part1-1_1.xsd @@ -1,93 +1,114 @@ -<?xml version="1.0" encoding="utf-8"?>
-<xs:schema
- targetNamespace="http://docs.oasis-open.org/wsdm/muws1-2.xsd"
- xmlns:muws1="http://docs.oasis-open.org/wsdm/muws1-2.xsd"
- xmlns:wsa="http://www.w3.org/2005/08/addressing"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified" attributeFormDefault="unqualified">
-
- <xs:import namespace="http://www.w3.org/2005/08/addressing"
- schemaLocation="WS-Addressing-2005_08.xsd"/>
-
-
- <xs:element name="ResourceId" type="xs:anyURI"/>
- <xs:element name="ManageabilityCapability" type="xs:anyURI"/>
-
-
- <xs:complexType name="CorrelatablePropertiesType">
- <xs:sequence>
- <xs:any minOccurs="0" maxOccurs="unbounded"
- namespace="##other" processContents="lax"/>
- </xs:sequence>
- <xs:attribute name="Dialect" type="xs:anyURI"/>
- <xs:attribute name="NegativeAssertionPossible" type="xs:boolean"/>
- <xs:anyAttribute namespace="##other"/>
- </xs:complexType>
-
- <xs:element name="CorrelatableProperties"
- type="muws1:CorrelatablePropertiesType"/>
-
-
- <xs:complexType name="ComponentAddressType">
- <xs:sequence>
- <xs:any namespace="##any" processContents="lax"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="ComponentType">
- <xs:sequence>
- <xs:element name="ResourceId" type="xs:anyURI"
- minOccurs="0"/>
- <xs:element name="ComponentAddress"
- type="muws1:ComponentAddressType"
- minOccurs="0" maxOccurs="unbounded"/>
- <xs:any minOccurs="0" maxOccurs="unbounded"
- namespace="##other" processContents="lax"/>
- </xs:sequence>
- <xs:anyAttribute namespace="##other"/>
- </xs:complexType>
-
-
- <xs:complexType name="ManagementEventType">
- <xs:sequence>
- <xs:element name="EventId" type="xs:anyURI"/>
- <xs:element name="SourceComponent" type="muws1:ComponentType"/>
- <xs:element name="ReporterComponent" type="muws1:ComponentType"
- minOccurs="0"/>
- <xs:any minOccurs="0" maxOccurs="unbounded"
- namespace="##other" processContents="lax"/>
- </xs:sequence>
- <xs:attribute name="ReportTime" type="xs:dateTime" use="optional"/>
- <xs:anyAttribute namespace="##other"/>
- </xs:complexType>
-
- <xs:element name="ManagementEvent"
- type="muws1:ManagementEventType"/>
-
- <xs:element name="ManageabilityEndpointReference"
- type="wsa:EndpointReferenceType"/>
-
-
-<!--
- SCHEMA COPY Material
-Copy and paste element references below into the schema of a resource properties document.
-These references are provide to insure that the correct minOccurs/maxOccurs attributes are specified in a resource property document schema.
-
-NOTE: You must import the MUWS Part 1 schema namespace (MUWS1).
-
- ** Identity Properties **
- <xs:element ref="muws1:ResourceId"/>
-
-
- ** ManageabilityCharacteristics Properties **
- <xs:element ref="muws1:ManageabilityCapability"
- minOccurs="0" maxOccurs="unbounded"/>
-
- ** Correlatable Properties **
- <xs:element ref="muws1:CorrelatableProperties"
- minOccurs="0" maxOccurs="unbounded"/>
-
--->
-
-</xs:schema>
-
+<?xml version="1.0" encoding="utf-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> + +<xs:schema + targetNamespace="http://docs.oasis-open.org/wsdm/muws1-2.xsd" + xmlns:muws1="http://docs.oasis-open.org/wsdm/muws1-2.xsd" + xmlns:wsa="http://www.w3.org/2005/08/addressing" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" attributeFormDefault="unqualified"> + + <xs:import namespace="http://www.w3.org/2005/08/addressing" + schemaLocation="WS-Addressing-2005_08.xsd"/> + + + <xs:element name="ResourceId" type="xs:anyURI"/> + <xs:element name="ManageabilityCapability" type="xs:anyURI"/> + + + <xs:complexType name="CorrelatablePropertiesType"> + <xs:sequence> + <xs:any minOccurs="0" maxOccurs="unbounded" + namespace="##other" processContents="lax"/> + </xs:sequence> + <xs:attribute name="Dialect" type="xs:anyURI"/> + <xs:attribute name="NegativeAssertionPossible" type="xs:boolean"/> + <xs:anyAttribute namespace="##other"/> + </xs:complexType> + + <xs:element name="CorrelatableProperties" + type="muws1:CorrelatablePropertiesType"/> + + + <xs:complexType name="ComponentAddressType"> + <xs:sequence> + <xs:any namespace="##any" processContents="lax"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="ComponentType"> + <xs:sequence> + <xs:element name="ResourceId" type="xs:anyURI" + minOccurs="0"/> + <xs:element name="ComponentAddress" + type="muws1:ComponentAddressType" + minOccurs="0" maxOccurs="unbounded"/> + <xs:any minOccurs="0" maxOccurs="unbounded" + namespace="##other" processContents="lax"/> + </xs:sequence> + <xs:anyAttribute namespace="##other"/> + </xs:complexType> + + + <xs:complexType name="ManagementEventType"> + <xs:sequence> + <xs:element name="EventId" type="xs:anyURI"/> + <xs:element name="SourceComponent" type="muws1:ComponentType"/> + <xs:element name="ReporterComponent" type="muws1:ComponentType" + minOccurs="0"/> + <xs:any minOccurs="0" maxOccurs="unbounded" + namespace="##other" processContents="lax"/> + </xs:sequence> + <xs:attribute name="ReportTime" type="xs:dateTime" use="optional"/> + <xs:anyAttribute namespace="##other"/> + </xs:complexType> + + <xs:element name="ManagementEvent" + type="muws1:ManagementEventType"/> + + <xs:element name="ManageabilityEndpointReference" + type="wsa:EndpointReferenceType"/> + + +<!-- + SCHEMA COPY Material +Copy and paste element references below into the schema of a resource properties document. +These references are provide to insure that the correct minOccurs/maxOccurs attributes are specified in a resource property document schema. + +NOTE: You must import the MUWS Part 1 schema namespace (MUWS1). + + ** Identity Properties ** + <xs:element ref="muws1:ResourceId"/> + + + ** ManageabilityCharacteristics Properties ** + <xs:element ref="muws1:ManageabilityCapability" + minOccurs="0" maxOccurs="unbounded"/> + + ** Correlatable Properties ** + <xs:element ref="muws1:CorrelatableProperties" + minOccurs="0" maxOccurs="unbounded"/> + +--> + +</xs:schema> + diff --git a/qpid/java/management/client/src/main/java/wsdl/WSDM-MUWS-Part2-1_1.xsd b/qpid/java/management/client/src/main/java/wsdl/WSDM-MUWS-Part2-1_1.xsd index 51233a0989..5ea0954734 100644 --- a/qpid/java/management/client/src/main/java/wsdl/WSDM-MUWS-Part2-1_1.xsd +++ b/qpid/java/management/client/src/main/java/wsdl/WSDM-MUWS-Part2-1_1.xsd @@ -1,656 +1,677 @@ -<?xml version="1.0" encoding="utf-8" ?>
-<xs:schema targetNamespace="http://docs.oasis-open.org/wsdm/muws2-2.xsd"
- xmlns:muws2="http://docs.oasis-open.org/wsdm/muws2-2.xsd"
- xmlns:muws1="http://docs.oasis-open.org/wsdm/muws1-2.xsd"
- xmlns:wsa="http://www.w3.org/2005/08/addressing"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:import namespace="http://docs.oasis-open.org/wsdm/muws1-2.xsd"
- schemaLocation="WSDM-MUWS-Part1-1_1.xsd" />
- <xs:import namespace="http://www.w3.org/2005/08/addressing"
- schemaLocation="WS-Addressing-2005_08.xsd" />
- <xs:import namespace="http://www.w3.org/XML/1998/namespace"
- schemaLocation="XML-Namespace-1998.xsd" />
- <xs:complexType name="LangString">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute ref="xml:lang" use="required" />
- <xs:anyAttribute namespace="##other" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- <!-- Begin properties for the Description capability -->
- <xs:element name="Caption" type="muws2:LangString" />
- <xs:element name="Description" type="muws2:LangString" />
- <xs:element name="Version" type="xs:string" />
- <!-- End properties for the Description capability -->
- <xs:complexType name="CategoryType">
- <xs:sequence>
- <xs:any minOccurs="0" namespace="##any"
- processContents="lax" />
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="StateType">
- <xs:complexContent>
- <xs:extension base="muws2:CategoryType" />
- </xs:complexContent>
- </xs:complexType>
- <xs:element name="State" type="muws2:StateType" />
- <xs:element name="EnteredState" type="muws2:StateType" />
- <xs:element name="PreviousState" type="muws2:StateType" />
- <xs:complexType name="StateTransitionType">
- <xs:sequence>
- <xs:element ref="muws2:EnteredState" />
- <xs:element ref="muws2:PreviousState" minOccurs="0" />
- <xs:any minOccurs="0" maxOccurs="unbounded"
- namespace="##other" processContents="lax" />
- </xs:sequence>
- <xs:attribute name="TransitionIdentifier" type="xs:anyURI"
- use="optional" />
- <xs:attribute name="Time" type="xs:dateTime" use="required" />
- <xs:anyAttribute namespace="##other" />
- </xs:complexType>
- <xs:element name="StateTransition" type="muws2:StateTransitionType" />
- <!-- Begin properties for the OperationalStatus capability -->
- <xs:element name="OperationalStatus">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="Available" />
- <xs:enumeration value="PartiallyAvailable" />
- <xs:enumeration value="Unavailable" />
- <xs:enumeration value="Unknown" />
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <!-- End properties for the OperationalStatus capability -->
- <xs:attributeGroup name="MetricAttributes">
- <xs:attribute name="ResetAt" type="xs:dateTime" />
- <xs:attribute name="LastUpdated" type="xs:dateTime" />
- <xs:attribute name="Duration" type="xs:duration" />
- </xs:attributeGroup>
- <!-- Begin properties for the Metrics capability -->
- <xs:element name="CurrentTime" type="xs:dateTime" />
- <!-- End properties for the Metrics capability -->
- <xs:complexType name="RelationshipTypeType">
- <xs:complexContent>
- <xs:extension base="muws2:CategoryType" />
- </xs:complexContent>
- </xs:complexType>
- <xs:element name="Self">
- <xs:complexType />
- </xs:element>
- <xs:complexType name="RelationshipParticipantType">
- <xs:sequence>
- <xs:element ref="muws2:Self" minOccurs="0" />
- <xs:element ref="muws1:ManageabilityEndpointReference"
- minOccurs="0" maxOccurs="unbounded" />
- <xs:element ref="wsa:EndpointReference" minOccurs="0"
- maxOccurs="unbounded" />
- <xs:element ref="muws1:ResourceId" minOccurs="0" />
- <xs:element name="Role" type="xs:anyURI" />
- <xs:any minOccurs="0" maxOccurs="unbounded"
- namespace="##other" processContents="lax" />
- </xs:sequence>
- <xs:anyAttribute namespace="##other" />
- </xs:complexType>
- <!-- Begin properties for the RelationshipResource capability -->
- <xs:element name="Name" type="xs:string" />
- <xs:element name="Type" type="muws2:RelationshipTypeType" />
- <xs:element name="Participant"
- type="muws2:RelationshipParticipantType" />
- <!-- End properties for the RelationshipResource capability -->
- <xs:complexType name="RelationshipType">
- <xs:sequence>
- <xs:element ref="muws2:Name" minOccurs="0" />
- <xs:element ref="muws2:Type" />
- <xs:element ref="muws2:Participant" minOccurs="2"
- maxOccurs="unbounded" />
- <xs:element name="AccessEndpointReference"
- type="wsa:EndpointReferenceType" minOccurs="0" />
- <xs:any minOccurs="0" maxOccurs="unbounded"
- namespace="##other" processContents="lax" />
- </xs:sequence>
- <xs:anyAttribute namespace="##other" />
- </xs:complexType>
- <!-- Begin properties for the Relationship capability -->
- <xs:element name="Relationship" type="muws2:RelationshipType" />
- <!-- End properties for the Relationship capability -->
- <xs:element name="RelationshipCreatedNotification">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="muws2:Relationship" />
- <xs:any minOccurs="0" maxOccurs="unbounded"
- namespace="##other" processContents="lax" />
- </xs:sequence>
- <xs:anyAttribute namespace="##other" />
- </xs:complexType>
- </xs:element>
- <xs:element name="RelationshipDeletedNotification">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="muws2:Relationship" />
- <xs:any minOccurs="0" maxOccurs="unbounded"
- namespace="##other" processContents="lax" />
- </xs:sequence>
- <xs:anyAttribute namespace="##other" />
- </xs:complexType>
- </xs:element>
- <xs:element name="QueryRelationshipsByType">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="RequestedType" type="xs:QName" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="QueryRelationshipsByTypeResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="muws2:Relationship" minOccurs="0"
- maxOccurs="unbounded" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="CreationNotification">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="muws1:ManageabilityEndpointReference"
- minOccurs="0" maxOccurs="unbounded" />
- </xs:sequence>
- <xs:anyAttribute namespace="##other" />
- </xs:complexType>
- </xs:element>
- <xs:element name="DestructionNotification">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="muws1:ResourceId" minOccurs="0" />
- </xs:sequence>
- <xs:anyAttribute namespace="##other" />
- </xs:complexType>
- </xs:element>
- <xs:complexType name="SituationCategoryType">
- <xs:complexContent>
- <xs:extension base="muws2:CategoryType" />
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType name="SubstitutableMsgType">
- <xs:sequence>
- <xs:element name="Value" type="xs:anySimpleType"
- minOccurs="0" maxOccurs="unbounded" />
- </xs:sequence>
- <xs:attribute name="MsgId" type="xs:string" use="required" />
- <xs:attribute name="MsgIdType" type="xs:anyURI" use="required" />
- </xs:complexType>
- <xs:complexType name="SituationType">
- <xs:sequence>
- <xs:element name="SituationCategory"
- type="muws2:SituationCategoryType" />
- <xs:element name="SuccessDisposition" minOccurs="0">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="Successful" />
- <xs:enumeration value="Unsuccessful" />
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="SituationTime" type="xs:dateTime" />
- <xs:element name="Priority" type="xs:short" minOccurs="0" />
- <xs:element name="Severity" type="xs:short" minOccurs="0" />
- <xs:element name="Message" type="muws2:LangString"
- minOccurs="0" />
- <xs:element name="SubstitutableMsg"
- type="muws2:SubstitutableMsgType" minOccurs="0" />
- </xs:sequence>
- </xs:complexType>
- <xs:element name="Situation" type="muws2:SituationType" />
- <xs:complexType name="EventCorrelationPropertiesType">
- <xs:sequence>
- <xs:element name="repeatCount" minOccurs="0"
- maxOccurs="1">
- <xs:simpleType>
- <xs:restriction base="xs:short">
- <xs:minInclusive value="0" />
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="elapsedTime" minOccurs="0"
- maxOccurs="1">
- <xs:simpleType>
- <xs:restriction base="xs:long">
- <xs:minInclusive value="0" />
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="sequenceNumber" type="xs:unsignedLong" />
- </xs:complexType>
- <xs:element name="EventCorrelationProperties"
- type="muws2:EventCorrelationPropertiesType" />
- <xs:complexType name="MsgCatalogInformationType">
- <xs:sequence>
- <xs:element name="msgCatalog" type="xs:anyURI"
- minOccurs="1" />
- <xs:element name="msgCatalogType" type="xs:anyURI"
- minOccurs="0" />
- </xs:sequence>
- </xs:complexType>
- <xs:element name="MsgCatalogInformation"
- type="muws2:MsgCatalogInformationType" />
- <!-- ##### Metadata description elements ##### -->
- <xs:element name="Capability" type="xs:anyURI" />
- <xs:complexType name="DialectableExpressionType" mixed="true">
- <xs:sequence>
- <xs:any namespace="##other" processContents="lax"
- minOccurs="0" maxOccurs="unbounded" />
- </xs:sequence>
- <xs:attribute name="Dialect" type="xs:anyURI" use="required" />
- <xs:anyAttribute namespace="##other" />
- </xs:complexType>
- <xs:element name="ValidWhile"
- type="muws2:DialectableExpressionType" />
- <xs:element name="Units" type="xs:string" />
- <xs:element name="ChangeType">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="Counter" />
- <xs:enumeration value="Gauge" />
- <xs:enumeration value="Unknown" />
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="TimeScope">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="Interval" />
- <xs:enumeration value="PointInTime" />
- <xs:enumeration value="SinceReset" />
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="GatheringTime">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="OnChange" />
- <xs:enumeration value="Periodic" />
- <xs:enumeration value="OnDemand" />
- <xs:enumeration value="Unknown" />
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="CalculationInterval" type="xs:duration" />
- <xs:element name="MetricGroup" type="xs:anyURI" />
- <xs:element name="PostCondition"
- type="muws2:DialectableExpressionType" />
- <!-- ========= StartSituation ============ -->
- <xs:element name="StartSituation">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType" />
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="StartInitiated">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType">
- <xs:sequence>
- <xs:element ref="muws2:StartSituation" />
- </xs:sequence>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="RestartInitiated">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType">
- <xs:sequence>
- <xs:element ref="muws2:StartSituation" />
- </xs:sequence>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="StartCompleted">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType">
- <xs:sequence>
- <xs:element ref="muws2:StartSituation" />
- </xs:sequence>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <!-- ========= StopSituation ============ -->
- <xs:element name="StopSituation">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType" />
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="StopInitiated">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType">
- <xs:sequence>
- <xs:element ref="muws2:StopSituation" />
- </xs:sequence>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="AbortInitiated">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType">
- <xs:sequence>
- <xs:element ref="muws2:StopSituation" />
- </xs:sequence>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="PauseInitiated">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType">
- <xs:sequence>
- <xs:element ref="muws2:StopSituation" />
- </xs:sequence>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="StopCompleted">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType">
- <xs:sequence>
- <xs:element ref="muws2:StopSituation" />
- </xs:sequence>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <!-- ========= RequestSituation ============ -->
- <xs:element name="RequestSituation">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType" />
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="RequestInitiated">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType">
- <xs:sequence>
- <xs:element ref="muws2:RequestSituation" />
- </xs:sequence>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="RequestCompleted">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType">
- <xs:sequence>
- <xs:element ref="muws2:RequestSituation" />
- </xs:sequence>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <!-- ========= DestroySituation ============ -->
- <xs:element name="DestroySituation">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType" />
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="DestroyInitiated">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType">
- <xs:sequence>
- <xs:element ref="muws2:DestroySituation" />
- </xs:sequence>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="DestroyCompleted">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType">
- <xs:sequence>
- <xs:element ref="muws2:DestroySituation" />
- </xs:sequence>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <!-- ========= CreateSituation ============ -->
- <xs:element name="CreateSituation">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType" />
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="CreateInitiated">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType">
- <xs:sequence>
- <xs:element ref="muws2:CreateSituation" />
- </xs:sequence>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="CreateCompleted">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType">
- <xs:sequence>
- <xs:element ref="muws2:CreateSituation" />
- </xs:sequence>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <!-- ========= ConnectSituation ============ -->
- <xs:element name="ConnectSituation">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType" />
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="ConnectInitiated">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType">
- <xs:sequence>
- <xs:element ref="muws2:ConnectSituation" />
- </xs:sequence>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="ReconnectInitiated">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType">
- <xs:sequence>
- <xs:element ref="muws2:ConnectSituation" />
- </xs:sequence>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="ConnectCompleted">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType">
- <xs:sequence>
- <xs:element ref="muws2:ConnectSituation" />
- </xs:sequence>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <!-- ========= ReportSituation ============ -->
- <xs:element name="ReportSituation">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType" />
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="PerformanceReport">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType">
- <xs:sequence>
- <xs:element ref="muws2:ReportSituation" />
- </xs:sequence>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="SecurityReport">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType">
- <xs:sequence>
- <xs:element ref="muws2:ReportSituation" />
- </xs:sequence>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="HeartbeatReport">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType">
- <xs:sequence>
- <xs:element ref="muws2:ReportSituation" />
- </xs:sequence>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="StatusReport">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType">
- <xs:sequence>
- <xs:element ref="muws2:ReportSituation" />
- </xs:sequence>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="TraceReport">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType">
- <xs:sequence>
- <xs:element ref="muws2:ReportSituation" />
- </xs:sequence>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="DebugReport">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType">
- <xs:sequence>
- <xs:element ref="muws2:ReportSituation" />
- </xs:sequence>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <xs:element name="LogReport">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType">
- <xs:sequence>
- <xs:element ref="muws2:ReportSituation" />
- </xs:sequence>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <!-- ========= AvailabilitySituation ============ -->
- <xs:element name="AvailabilitySituation">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType" />
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <!-- ========= CapabilitySituation ============ -->
- <xs:element name="CapabilitySituation">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType" />
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <!-- ========= ConfigureSituation ============ -->
- <xs:element name="ConfigureSituation">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType" />
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <!-- ========= OtherSituation ============ -->
- <xs:element name="OtherSituation">
- <xs:complexType>
- <xs:complexContent>
- <xs:restriction base="muws2:SituationCategoryType" />
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- <!--
- SCHEMA COPY Material
- Copy and paste element references below into the schema of a resource properties document.
- These references insure that the correct minOccurs/maxOccurs attributes are specified in a resource property document schema.
-
- NOTE: You must import the MUWS Part 2 schema namespace (MUWS2).
-
- ** Description Properties **
- <xs:element ref="muws2:Caption"
- minOccurs="0" maxOccurs="unbounded"/>
- <xs:element ref="muws2:Description"
- minOccurs="0" maxOccurs="unbounded"/>
- <xs:element ref="muws2:Version"
- minOccurs="0"/>
-
- ** Operational Status **
- <xs:element ref="muws2:OperationalStatus"/>
-
- ** Metrics **
- <xs:element ref="muws2:CurrentTime"/>
-
- ** Relationship **
- <xs:element ref="muws2:Relationship"
- minOccurs="0" maxOccurs="unbounded"/>
-
- ** Relationship Resource **
- <xs:element ref="muws2:Name" minOccurs="0"/>
- <xs:element ref="muws2:Type"/>
- <xs:element ref="muws2:Participant"
- minOccurs="2" maxOccurs="unbounded"/>
-
- -->
-</xs:schema>
\ No newline at end of file +<?xml version="1.0" encoding="utf-8" ?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> + +<xs:schema targetNamespace="http://docs.oasis-open.org/wsdm/muws2-2.xsd" + xmlns:muws2="http://docs.oasis-open.org/wsdm/muws2-2.xsd" + xmlns:muws1="http://docs.oasis-open.org/wsdm/muws1-2.xsd" + xmlns:wsa="http://www.w3.org/2005/08/addressing" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" attributeFormDefault="unqualified"> + <xs:import namespace="http://docs.oasis-open.org/wsdm/muws1-2.xsd" + schemaLocation="WSDM-MUWS-Part1-1_1.xsd" /> + <xs:import namespace="http://www.w3.org/2005/08/addressing" + schemaLocation="WS-Addressing-2005_08.xsd" /> + <xs:import namespace="http://www.w3.org/XML/1998/namespace" + schemaLocation="XML-Namespace-1998.xsd" /> + <xs:complexType name="LangString"> + <xs:simpleContent> + <xs:extension base="xs:string"> + <xs:attribute ref="xml:lang" use="required" /> + <xs:anyAttribute namespace="##other" /> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + <!-- Begin properties for the Description capability --> + <xs:element name="Caption" type="muws2:LangString" /> + <xs:element name="Description" type="muws2:LangString" /> + <xs:element name="Version" type="xs:string" /> + <!-- End properties for the Description capability --> + <xs:complexType name="CategoryType"> + <xs:sequence> + <xs:any minOccurs="0" namespace="##any" + processContents="lax" /> + </xs:sequence> + </xs:complexType> + <xs:complexType name="StateType"> + <xs:complexContent> + <xs:extension base="muws2:CategoryType" /> + </xs:complexContent> + </xs:complexType> + <xs:element name="State" type="muws2:StateType" /> + <xs:element name="EnteredState" type="muws2:StateType" /> + <xs:element name="PreviousState" type="muws2:StateType" /> + <xs:complexType name="StateTransitionType"> + <xs:sequence> + <xs:element ref="muws2:EnteredState" /> + <xs:element ref="muws2:PreviousState" minOccurs="0" /> + <xs:any minOccurs="0" maxOccurs="unbounded" + namespace="##other" processContents="lax" /> + </xs:sequence> + <xs:attribute name="TransitionIdentifier" type="xs:anyURI" + use="optional" /> + <xs:attribute name="Time" type="xs:dateTime" use="required" /> + <xs:anyAttribute namespace="##other" /> + </xs:complexType> + <xs:element name="StateTransition" type="muws2:StateTransitionType" /> + <!-- Begin properties for the OperationalStatus capability --> + <xs:element name="OperationalStatus"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="Available" /> + <xs:enumeration value="PartiallyAvailable" /> + <xs:enumeration value="Unavailable" /> + <xs:enumeration value="Unknown" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <!-- End properties for the OperationalStatus capability --> + <xs:attributeGroup name="MetricAttributes"> + <xs:attribute name="ResetAt" type="xs:dateTime" /> + <xs:attribute name="LastUpdated" type="xs:dateTime" /> + <xs:attribute name="Duration" type="xs:duration" /> + </xs:attributeGroup> + <!-- Begin properties for the Metrics capability --> + <xs:element name="CurrentTime" type="xs:dateTime" /> + <!-- End properties for the Metrics capability --> + <xs:complexType name="RelationshipTypeType"> + <xs:complexContent> + <xs:extension base="muws2:CategoryType" /> + </xs:complexContent> + </xs:complexType> + <xs:element name="Self"> + <xs:complexType /> + </xs:element> + <xs:complexType name="RelationshipParticipantType"> + <xs:sequence> + <xs:element ref="muws2:Self" minOccurs="0" /> + <xs:element ref="muws1:ManageabilityEndpointReference" + minOccurs="0" maxOccurs="unbounded" /> + <xs:element ref="wsa:EndpointReference" minOccurs="0" + maxOccurs="unbounded" /> + <xs:element ref="muws1:ResourceId" minOccurs="0" /> + <xs:element name="Role" type="xs:anyURI" /> + <xs:any minOccurs="0" maxOccurs="unbounded" + namespace="##other" processContents="lax" /> + </xs:sequence> + <xs:anyAttribute namespace="##other" /> + </xs:complexType> + <!-- Begin properties for the RelationshipResource capability --> + <xs:element name="Name" type="xs:string" /> + <xs:element name="Type" type="muws2:RelationshipTypeType" /> + <xs:element name="Participant" + type="muws2:RelationshipParticipantType" /> + <!-- End properties for the RelationshipResource capability --> + <xs:complexType name="RelationshipType"> + <xs:sequence> + <xs:element ref="muws2:Name" minOccurs="0" /> + <xs:element ref="muws2:Type" /> + <xs:element ref="muws2:Participant" minOccurs="2" + maxOccurs="unbounded" /> + <xs:element name="AccessEndpointReference" + type="wsa:EndpointReferenceType" minOccurs="0" /> + <xs:any minOccurs="0" maxOccurs="unbounded" + namespace="##other" processContents="lax" /> + </xs:sequence> + <xs:anyAttribute namespace="##other" /> + </xs:complexType> + <!-- Begin properties for the Relationship capability --> + <xs:element name="Relationship" type="muws2:RelationshipType" /> + <!-- End properties for the Relationship capability --> + <xs:element name="RelationshipCreatedNotification"> + <xs:complexType> + <xs:sequence> + <xs:element ref="muws2:Relationship" /> + <xs:any minOccurs="0" maxOccurs="unbounded" + namespace="##other" processContents="lax" /> + </xs:sequence> + <xs:anyAttribute namespace="##other" /> + </xs:complexType> + </xs:element> + <xs:element name="RelationshipDeletedNotification"> + <xs:complexType> + <xs:sequence> + <xs:element ref="muws2:Relationship" /> + <xs:any minOccurs="0" maxOccurs="unbounded" + namespace="##other" processContents="lax" /> + </xs:sequence> + <xs:anyAttribute namespace="##other" /> + </xs:complexType> + </xs:element> + <xs:element name="QueryRelationshipsByType"> + <xs:complexType> + <xs:sequence> + <xs:element name="RequestedType" type="xs:QName" /> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="QueryRelationshipsByTypeResponse"> + <xs:complexType> + <xs:sequence> + <xs:element ref="muws2:Relationship" minOccurs="0" + maxOccurs="unbounded" /> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="CreationNotification"> + <xs:complexType> + <xs:sequence> + <xs:element ref="muws1:ManageabilityEndpointReference" + minOccurs="0" maxOccurs="unbounded" /> + </xs:sequence> + <xs:anyAttribute namespace="##other" /> + </xs:complexType> + </xs:element> + <xs:element name="DestructionNotification"> + <xs:complexType> + <xs:sequence> + <xs:element ref="muws1:ResourceId" minOccurs="0" /> + </xs:sequence> + <xs:anyAttribute namespace="##other" /> + </xs:complexType> + </xs:element> + <xs:complexType name="SituationCategoryType"> + <xs:complexContent> + <xs:extension base="muws2:CategoryType" /> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="SubstitutableMsgType"> + <xs:sequence> + <xs:element name="Value" type="xs:anySimpleType" + minOccurs="0" maxOccurs="unbounded" /> + </xs:sequence> + <xs:attribute name="MsgId" type="xs:string" use="required" /> + <xs:attribute name="MsgIdType" type="xs:anyURI" use="required" /> + </xs:complexType> + <xs:complexType name="SituationType"> + <xs:sequence> + <xs:element name="SituationCategory" + type="muws2:SituationCategoryType" /> + <xs:element name="SuccessDisposition" minOccurs="0"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="Successful" /> + <xs:enumeration value="Unsuccessful" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="SituationTime" type="xs:dateTime" /> + <xs:element name="Priority" type="xs:short" minOccurs="0" /> + <xs:element name="Severity" type="xs:short" minOccurs="0" /> + <xs:element name="Message" type="muws2:LangString" + minOccurs="0" /> + <xs:element name="SubstitutableMsg" + type="muws2:SubstitutableMsgType" minOccurs="0" /> + </xs:sequence> + </xs:complexType> + <xs:element name="Situation" type="muws2:SituationType" /> + <xs:complexType name="EventCorrelationPropertiesType"> + <xs:sequence> + <xs:element name="repeatCount" minOccurs="0" + maxOccurs="1"> + <xs:simpleType> + <xs:restriction base="xs:short"> + <xs:minInclusive value="0" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="elapsedTime" minOccurs="0" + maxOccurs="1"> + <xs:simpleType> + <xs:restriction base="xs:long"> + <xs:minInclusive value="0" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + </xs:sequence> + <xs:attribute name="sequenceNumber" type="xs:unsignedLong" /> + </xs:complexType> + <xs:element name="EventCorrelationProperties" + type="muws2:EventCorrelationPropertiesType" /> + <xs:complexType name="MsgCatalogInformationType"> + <xs:sequence> + <xs:element name="msgCatalog" type="xs:anyURI" + minOccurs="1" /> + <xs:element name="msgCatalogType" type="xs:anyURI" + minOccurs="0" /> + </xs:sequence> + </xs:complexType> + <xs:element name="MsgCatalogInformation" + type="muws2:MsgCatalogInformationType" /> + <!-- ##### Metadata description elements ##### --> + <xs:element name="Capability" type="xs:anyURI" /> + <xs:complexType name="DialectableExpressionType" mixed="true"> + <xs:sequence> + <xs:any namespace="##other" processContents="lax" + minOccurs="0" maxOccurs="unbounded" /> + </xs:sequence> + <xs:attribute name="Dialect" type="xs:anyURI" use="required" /> + <xs:anyAttribute namespace="##other" /> + </xs:complexType> + <xs:element name="ValidWhile" + type="muws2:DialectableExpressionType" /> + <xs:element name="Units" type="xs:string" /> + <xs:element name="ChangeType"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="Counter" /> + <xs:enumeration value="Gauge" /> + <xs:enumeration value="Unknown" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="TimeScope"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="Interval" /> + <xs:enumeration value="PointInTime" /> + <xs:enumeration value="SinceReset" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="GatheringTime"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:enumeration value="OnChange" /> + <xs:enumeration value="Periodic" /> + <xs:enumeration value="OnDemand" /> + <xs:enumeration value="Unknown" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="CalculationInterval" type="xs:duration" /> + <xs:element name="MetricGroup" type="xs:anyURI" /> + <xs:element name="PostCondition" + type="muws2:DialectableExpressionType" /> + <!-- ========= StartSituation ============ --> + <xs:element name="StartSituation"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType" /> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="StartInitiated"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType"> + <xs:sequence> + <xs:element ref="muws2:StartSituation" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="RestartInitiated"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType"> + <xs:sequence> + <xs:element ref="muws2:StartSituation" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="StartCompleted"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType"> + <xs:sequence> + <xs:element ref="muws2:StartSituation" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <!-- ========= StopSituation ============ --> + <xs:element name="StopSituation"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType" /> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="StopInitiated"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType"> + <xs:sequence> + <xs:element ref="muws2:StopSituation" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="AbortInitiated"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType"> + <xs:sequence> + <xs:element ref="muws2:StopSituation" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="PauseInitiated"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType"> + <xs:sequence> + <xs:element ref="muws2:StopSituation" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="StopCompleted"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType"> + <xs:sequence> + <xs:element ref="muws2:StopSituation" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <!-- ========= RequestSituation ============ --> + <xs:element name="RequestSituation"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType" /> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="RequestInitiated"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType"> + <xs:sequence> + <xs:element ref="muws2:RequestSituation" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="RequestCompleted"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType"> + <xs:sequence> + <xs:element ref="muws2:RequestSituation" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <!-- ========= DestroySituation ============ --> + <xs:element name="DestroySituation"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType" /> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="DestroyInitiated"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType"> + <xs:sequence> + <xs:element ref="muws2:DestroySituation" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="DestroyCompleted"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType"> + <xs:sequence> + <xs:element ref="muws2:DestroySituation" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <!-- ========= CreateSituation ============ --> + <xs:element name="CreateSituation"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType" /> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="CreateInitiated"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType"> + <xs:sequence> + <xs:element ref="muws2:CreateSituation" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="CreateCompleted"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType"> + <xs:sequence> + <xs:element ref="muws2:CreateSituation" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <!-- ========= ConnectSituation ============ --> + <xs:element name="ConnectSituation"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType" /> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="ConnectInitiated"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType"> + <xs:sequence> + <xs:element ref="muws2:ConnectSituation" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="ReconnectInitiated"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType"> + <xs:sequence> + <xs:element ref="muws2:ConnectSituation" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="ConnectCompleted"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType"> + <xs:sequence> + <xs:element ref="muws2:ConnectSituation" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <!-- ========= ReportSituation ============ --> + <xs:element name="ReportSituation"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType" /> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="PerformanceReport"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType"> + <xs:sequence> + <xs:element ref="muws2:ReportSituation" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="SecurityReport"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType"> + <xs:sequence> + <xs:element ref="muws2:ReportSituation" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="HeartbeatReport"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType"> + <xs:sequence> + <xs:element ref="muws2:ReportSituation" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="StatusReport"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType"> + <xs:sequence> + <xs:element ref="muws2:ReportSituation" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="TraceReport"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType"> + <xs:sequence> + <xs:element ref="muws2:ReportSituation" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="DebugReport"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType"> + <xs:sequence> + <xs:element ref="muws2:ReportSituation" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <xs:element name="LogReport"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType"> + <xs:sequence> + <xs:element ref="muws2:ReportSituation" /> + </xs:sequence> + </xs:restriction> + </xs:complexContent> + </xs:complexType> + </xs:element> + <!-- ========= AvailabilitySituation ============ --> + <xs:element name="AvailabilitySituation"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType" /> + </xs:complexContent> + </xs:complexType> + </xs:element> + <!-- ========= CapabilitySituation ============ --> + <xs:element name="CapabilitySituation"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType" /> + </xs:complexContent> + </xs:complexType> + </xs:element> + <!-- ========= ConfigureSituation ============ --> + <xs:element name="ConfigureSituation"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType" /> + </xs:complexContent> + </xs:complexType> + </xs:element> + <!-- ========= OtherSituation ============ --> + <xs:element name="OtherSituation"> + <xs:complexType> + <xs:complexContent> + <xs:restriction base="muws2:SituationCategoryType" /> + </xs:complexContent> + </xs:complexType> + </xs:element> + <!-- + SCHEMA COPY Material + Copy and paste element references below into the schema of a resource properties document. + These references insure that the correct minOccurs/maxOccurs attributes are specified in a resource property document schema. + + NOTE: You must import the MUWS Part 2 schema namespace (MUWS2). + + ** Description Properties ** + <xs:element ref="muws2:Caption" + minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="muws2:Description" + minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="muws2:Version" + minOccurs="0"/> + + ** Operational Status ** + <xs:element ref="muws2:OperationalStatus"/> + + ** Metrics ** + <xs:element ref="muws2:CurrentTime"/> + + ** Relationship ** + <xs:element ref="muws2:Relationship" + minOccurs="0" maxOccurs="unbounded"/> + + ** Relationship Resource ** + <xs:element ref="muws2:Name" minOccurs="0"/> + <xs:element ref="muws2:Type"/> + <xs:element ref="muws2:Participant" + minOccurs="2" maxOccurs="unbounded"/> + + --> +</xs:schema> diff --git a/qpid/java/management/client/src/main/java/wsdl/XML-Namespace-1998.xsd b/qpid/java/management/client/src/main/java/wsdl/XML-Namespace-1998.xsd index 998a8001de..f51b67f78f 100644 --- a/qpid/java/management/client/src/main/java/wsdl/XML-Namespace-1998.xsd +++ b/qpid/java/management/client/src/main/java/wsdl/XML-Namespace-1998.xsd @@ -1,25 +1,46 @@ -<?xml version='1.0'?>
-<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
-
- <xs:attribute name="lang" type="xs:language">
- </xs:attribute>
-
- <xs:attribute name="space" default="preserve">
- <xs:simpleType>
- <xs:restriction base="xs:NCName">
- <xs:enumeration value="default"/>
- <xs:enumeration value="preserve"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
-
- <xs:attribute name="base" type="xs:anyURI">
- </xs:attribute>
-
- <xs:attributeGroup name="specialAttrs">
- <xs:attribute ref="xml:base"/>
- <xs:attribute ref="xml:lang"/>
- <xs:attribute ref="xml:space"/>
- </xs:attributeGroup>
-
-</xs:schema>
+<?xml version='1.0'?> +<!-- + + 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. + +--> + +<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en"> + + <xs:attribute name="lang" type="xs:language"> + </xs:attribute> + + <xs:attribute name="space" default="preserve"> + <xs:simpleType> + <xs:restriction base="xs:NCName"> + <xs:enumeration value="default"/> + <xs:enumeration value="preserve"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + + <xs:attribute name="base" type="xs:anyURI"> + </xs:attribute> + + <xs:attributeGroup name="specialAttrs"> + <xs:attribute ref="xml:base"/> + <xs:attribute ref="xml:lang"/> + <xs:attribute ref="xml:space"/> + </xs:attributeGroup> + +</xs:schema> diff --git a/qpid/java/management/client/src/test/java/log4j.xml b/qpid/java/management/client/src/test/java/log4j.xml index 34634b7738..891e7908e2 100644 --- a/qpid/java/management/client/src/test/java/log4j.xml +++ b/qpid/java/management/client/src/test/java/log4j.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> + <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> @@ -11,15 +32,15 @@ value="%d{ABSOLUTE} %-5p [%c{1}] %m%n" /> </layout> </appender> - <category name="org.apache.qpid.management">
- <priority value="INFO" />
- <appender-ref ref="CONSOLE" />
- </category>
-
- <category name="org.mortbay">
- <priority value="INFO" />
- <appender-ref ref="CONSOLE" />
- </category>
+ <category name="org.apache.qpid.management"> + <priority value="INFO" /> + <appender-ref ref="CONSOLE" /> + </category> + + <category name="org.mortbay"> + <priority value="INFO" /> + <appender-ref ref="CONSOLE" /> + </category> <category name="org.apache.qpid.qman.debug.XmlDebugger"> <priority value="DEBUG" /> @@ -29,4 +50,4 @@ <priority value="ERROR" /> </root> -</log4j:configuration>
\ No newline at end of file +</log4j:configuration> diff --git a/qpid/java/management/client/src/test/java/org/apache/qpid/management/wsdm/web.xml b/qpid/java/management/client/src/test/java/org/apache/qpid/management/wsdm/web.xml index d0a9eb20a4..df273bd841 100644 --- a/qpid/java/management/client/src/test/java/org/apache/qpid/management/wsdm/web.xml +++ b/qpid/java/management/client/src/test/java/org/apache/qpid/management/wsdm/web.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> + <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> @@ -8,4 +29,4 @@ <servlet-class>org.apache.qpid.management.wsdm.QEmuInitializer</servlet-class> <load-on-startup>1</load-on-startup> </servlet> -</web-app>
\ No newline at end of file +</web-app> diff --git a/qpid/java/management/client/web.xml b/qpid/java/management/client/web.xml index 29eb64a268..881fc82f46 100644 --- a/qpid/java/management/client/web.xml +++ b/qpid/java/management/client/web.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> + <web-app id="qman" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> @@ -125,4 +146,4 @@ <login-config> <auth-method>BASIC</auth-method> </login-config> -</web-app>
\ No newline at end of file +</web-app> diff --git a/qpid/java/management/console/src/main/java/org/apache/qpid/console/XMLUtil.java b/qpid/java/management/console/src/main/java/org/apache/qpid/console/XMLUtil.java index 1ab93de6a2..dcbcb5b6b6 100644 --- a/qpid/java/management/console/src/main/java/org/apache/qpid/console/XMLUtil.java +++ b/qpid/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/qpid/java/perftests/bin/monitoring/monitor-broker.sh b/qpid/java/perftests/bin/monitoring/monitor-broker.sh index 39f4760114..ab1ed42177 100755 --- a/qpid/java/perftests/bin/monitoring/monitor-broker.sh +++ b/qpid/java/perftests/bin/monitoring/monitor-broker.sh @@ -1,5 +1,47 @@ +# +# +# 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. +# +# + #!/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 # script. diff --git a/qpid/java/perftests/bin/monitoring/runTests.sh b/qpid/java/perftests/bin/monitoring/runTests.sh index 4ba5040ccc..494d05a411 100755 --- a/qpid/java/perftests/bin/monitoring/runTests.sh +++ b/qpid/java/perftests/bin/monitoring/runTests.sh @@ -1,5 +1,47 @@ +# +# +# 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. +# +# + #!/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/qpid/java/perftests/bin/monitoring/stop-monitored-broker.sh b/qpid/java/perftests/bin/monitoring/stop-monitored-broker.sh index 2bd1d1771a..9ae1df1007 100755 --- a/qpid/java/perftests/bin/monitoring/stop-monitored-broker.sh +++ b/qpid/java/perftests/bin/monitoring/stop-monitored-broker.sh @@ -1,5 +1,47 @@ +# +# +# 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. +# +# + #!/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/qpid/java/perftests/bin/processing/process.sh b/qpid/java/perftests/bin/processing/process.sh index 84d6467f87..666dee4203 100755 --- a/qpid/java/perftests/bin/processing/process.sh +++ b/qpid/java/perftests/bin/processing/process.sh @@ -1,4 +1,46 @@ +# +# +# 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. +# +# + #!/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/qpid/java/perftests/bin/processing/processAll.sh b/qpid/java/perftests/bin/processing/processAll.sh index 7fce0abb60..8401da1e41 100755 --- a/qpid/java/perftests/bin/processing/processAll.sh +++ b/qpid/java/perftests/bin/processing/processAll.sh @@ -1,4 +1,46 @@ +# +# +# 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. +# +# + #!/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/qpid/java/perftests/etc/scripts/extractResults.sh b/qpid/java/perftests/etc/scripts/extractResults.sh index 95aff9edba..24bb2bd34f 100755 --- a/qpid/java/perftests/etc/scripts/extractResults.sh +++ b/qpid/java/perftests/etc/scripts/extractResults.sh @@ -1,5 +1,47 @@ +# +# +# 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. +# +# + #!/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/qpid/java/perftests/etc/scripts/extractThroughputResults.sh b/qpid/java/perftests/etc/scripts/extractThroughputResults.sh index e85286ea3e..7083b87ac3 100755 --- a/qpid/java/perftests/etc/scripts/extractThroughputResults.sh +++ b/qpid/java/perftests/etc/scripts/extractThroughputResults.sh @@ -1,5 +1,47 @@ +# +# +# 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. +# +# + #!/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/qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml b/qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml index 67e0702c41..4e32d21849 100644 --- a/qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml +++ b/qpid/java/systests/etc/config-systests-ServerConfigurationTest-Old.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> + <configuration> <work>${QPID_WORK}</work> <conf>${QPID_HOME}/etc</conf> diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java index cbdb310179..5e387be91b 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java +++ b/qpid/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/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/ErrorHandler.java b/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/ErrorHandler.java index a1add8e03f..dbc73c404f 100644 --- a/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/ErrorHandler.java +++ b/qpid/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 { diff --git a/qpid/python/examples/datatypes/testdata.py b/qpid/python/examples/datatypes/testdata.py index cdf140d400..251872ff52 100644 --- a/qpid/python/examples/datatypes/testdata.py +++ b/qpid/python/examples/datatypes/testdata.py @@ -1,3 +1,24 @@ +# +# +# 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. +# +# + # -*- encoding: utf-8 -*- from qpid.datatypes import uuid4, timestamp |