You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ea...@apache.org on 2016/05/19 16:24:37 UTC
qpid-dispatch git commit: DISPATCH-307: Added licensing headers,
included .war artifact, removed unused qdrGraphs.html
Repository: qpid-dispatch
Updated Branches:
refs/heads/master 0cc6b2ca6 -> 5f843abcc
DISPATCH-307: Added licensing headers, included .war artifact, removed unused qdrGraphs.html
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/5f843abc
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/5f843abc
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/5f843abc
Branch: refs/heads/master
Commit: 5f843abcc9d0ce028b2e5e005921d89d8dbdda1d
Parents: 0cc6b2c
Author: Ernest Allen <ea...@redhat.com>
Authored: Thu May 19 12:24:15 2016 -0400
Committer: Ernest Allen <ea...@redhat.com>
Committed: Thu May 19 12:24:15 2016 -0400
----------------------------------------------------------------------
.../qpid/dispatch/PluginContextListener.java | 20 ++++++++++++++++++++
.../hawtio/src/main/resources/WEB-INF/web.xml | 14 ++++++++++++++
.../hawtio/src/main/resources/log4j.properties | 20 ++++++++++++++++++++
.../src/main/webapp/plugin/html/qdrCharts.html | 18 ++++++++++++++++++
.../src/main/webapp/plugin/html/qdrConnect.html | 18 ++++++++++++++++++
.../src/main/webapp/plugin/html/qdrGraphs.html | 15 ---------------
.../src/main/webapp/plugin/js/dispatchPlugin.js | 18 ++++++++++++++++++
console/stand-alone/plugin/html/qdrCharts.html | 18 ++++++++++++++++++
console/stand-alone/plugin/html/qdrConnect.html | 18 ++++++++++++++++++
console/stand-alone/plugin/html/qdrGraphs.html | 15 ---------------
10 files changed, 144 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/5f843abc/console/hawtio/src/main/java/org/apache/qpid/dispatch/PluginContextListener.java
----------------------------------------------------------------------
diff --git a/console/hawtio/src/main/java/org/apache/qpid/dispatch/PluginContextListener.java b/console/hawtio/src/main/java/org/apache/qpid/dispatch/PluginContextListener.java
index 7905ac0..806f7a0 100644
--- a/console/hawtio/src/main/java/org/apache/qpid/dispatch/PluginContextListener.java
+++ b/console/hawtio/src/main/java/org/apache/qpid/dispatch/PluginContextListener.java
@@ -1,3 +1,23 @@
+/*
+ *
+ * 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.
+ *
+*/
package org.apache.qpid.dispatch;
import io.hawt.web.plugin.HawtioPlugin;
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/5f843abc/console/hawtio/src/main/resources/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/console/hawtio/src/main/resources/WEB-INF/web.xml b/console/hawtio/src/main/resources/WEB-INF/web.xml
index 66e8dba..ee81d02 100644
--- a/console/hawtio/src/main/resources/WEB-INF/web.xml
+++ b/console/hawtio/src/main/resources/WEB-INF/web.xml
@@ -1,4 +1,18 @@
<?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 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://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/5f843abc/console/hawtio/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/console/hawtio/src/main/resources/log4j.properties b/console/hawtio/src/main/resources/log4j.properties
index a2ecc8d..2586145 100644
--- a/console/hawtio/src/main/resources/log4j.properties
+++ b/console/hawtio/src/main/resources/log4j.properties
@@ -1,3 +1,23 @@
+/*
+ *
+ * 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.
+ *
+ */
log4j.rootLogger=INFO, console
log4j.appender.console=org.apache.log4j.ConsoleAppender
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/5f843abc/console/hawtio/src/main/webapp/plugin/html/qdrCharts.html
----------------------------------------------------------------------
diff --git a/console/hawtio/src/main/webapp/plugin/html/qdrCharts.html b/console/hawtio/src/main/webapp/plugin/html/qdrCharts.html
index 9f1319c..3267a9d 100644
--- a/console/hawtio/src/main/webapp/plugin/html/qdrCharts.html
+++ b/console/hawtio/src/main/webapp/plugin/html/qdrCharts.html
@@ -1,3 +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.
+-->
<div class="main-display row-fluid qdrCharts" ng-controller="QDR.ChartsController">
<div ng-hide="dashLogin" ng-repeat="chart in svgCharts" class="chartContainer ">
<p class="chartLabels">
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/5f843abc/console/hawtio/src/main/webapp/plugin/html/qdrConnect.html
----------------------------------------------------------------------
diff --git a/console/hawtio/src/main/webapp/plugin/html/qdrConnect.html b/console/hawtio/src/main/webapp/plugin/html/qdrConnect.html
index 83b5e2d..38305ae 100644
--- a/console/hawtio/src/main/webapp/plugin/html/qdrConnect.html
+++ b/console/hawtio/src/main/webapp/plugin/html/qdrConnect.html
@@ -1,3 +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.
+-->
<div class="row-fluid" ng-controller="QDR.SettingsController">
<div class="login container" ng-hide="connecting">
<div class="row" id="dispatch-login-container">
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/5f843abc/console/hawtio/src/main/webapp/plugin/html/qdrGraphs.html
----------------------------------------------------------------------
diff --git a/console/hawtio/src/main/webapp/plugin/html/qdrGraphs.html b/console/hawtio/src/main/webapp/plugin/html/qdrGraphs.html
deleted file mode 100644
index c311246..0000000
--- a/console/hawtio/src/main/webapp/plugin/html/qdrGraphs.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<div ng-controller="QDR.ListController" title=""
- class="prefs">
- <div class="row-fluid">
- <div class="tabbable">
- <div value="graphs"
- class="tab-pane"
- title="graphs">
- <div>
- <div id="graph"></div>
-
- </div>
- </div>
- </div>
- </div>
-</div>
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/5f843abc/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
----------------------------------------------------------------------
diff --git a/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js b/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
index 0e71d2f..7d7cbd8 100644
--- a/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
+++ b/console/hawtio/src/main/webapp/plugin/js/dispatchPlugin.js
@@ -1,3 +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.
+*/
/**
* @module QDR
* @mail QDR
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/5f843abc/console/stand-alone/plugin/html/qdrCharts.html
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/html/qdrCharts.html b/console/stand-alone/plugin/html/qdrCharts.html
index 8ba1ffe..ccb7b5a 100644
--- a/console/stand-alone/plugin/html/qdrCharts.html
+++ b/console/stand-alone/plugin/html/qdrCharts.html
@@ -1,3 +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.
+-->
<div class="main-display row-fluid qdrCharts" ng-controller="QDR.ChartsController">
<div ng-show="hasCharts()">
<div ng-repeat="chart in svgCharts" class="chartContainer">
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/5f843abc/console/stand-alone/plugin/html/qdrConnect.html
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/html/qdrConnect.html b/console/stand-alone/plugin/html/qdrConnect.html
index 34e452f..e2cefde 100644
--- a/console/stand-alone/plugin/html/qdrConnect.html
+++ b/console/stand-alone/plugin/html/qdrConnect.html
@@ -1,3 +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.
+-->
<div class="row-fluid" ng-controller="QDR.SettingsController">
<div class="login container" ng-hide="connecting">
<div class="row" id="login-container">
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/5f843abc/console/stand-alone/plugin/html/qdrGraphs.html
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/html/qdrGraphs.html b/console/stand-alone/plugin/html/qdrGraphs.html
deleted file mode 100644
index c311246..0000000
--- a/console/stand-alone/plugin/html/qdrGraphs.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<div ng-controller="QDR.ListController" title=""
- class="prefs">
- <div class="row-fluid">
- <div class="tabbable">
- <div value="graphs"
- class="tab-pane"
- title="graphs">
- <div>
- <div id="graph"></div>
-
- </div>
- </div>
- </div>
- </div>
-</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org