QPID-51

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@482571 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 96 insertions, 29 deletions

diff --git a/java/management/eclipse-plugin/build.xml b/java/management/eclipse-plugin/build.xml
index ae102d1e72..407381b03f 100644
--- a/java/management/eclipse-plugin/build.xml
+++ b/java/management/eclipse-plugin/build.xml
@@ -1,4 +1,22 @@
 <?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.
+-->
 <project name="org.apache.qpid.management.ui" default="build.update.jar" basedir=".">
 
     <property name="basews" value="${ws}"/>
@@ -24,6 +42,7 @@
     <property name="bundleJavacTarget" value="${javacTarget}"/>
     <property name="bundleBootClasspath" value="${bootclasspath}"/>
     <property name="pluginName" value="org.apache.qpid.management.ui"/>
+    <property name="distName" value="qpidmc"/>
     <property name="version" value="0.1.0"/>
 
     <target name="init" depends="properties">
@@ -144,6 +163,7 @@
         <delete file="${build.result.folder}/src.zip"/>
         <delete file="${plugins.folder}/${pluginName}_${version}.jar"/>
         <delete file="${target.folder}/${pluginName}_${version}.zip"/>
+        <delete file="${target.folder}/${distName}_${version}.zip"/>
         <delete dir="${temp.folder}"/>
     </target>
 
@@ -170,26 +190,26 @@
         <antcall target="build.update.jar"/>
         <antcall target="build.sources"/>
         <antcall target="gather.sources">
-            <param name="destination.temp.folder" value="${temp.folder}/${pluginName}"/>
+            <param name="destination.temp.folder" value="${temp.folder}/${distName}"/>
         </antcall>
-            <copy todir="${temp.folder}/${pluginName}/plugins" failonerror="true" overwrite="false">
-                <fileset dir="${plugins.folder}" includes="**"  />
-            </copy>
-         <copy todir="${temp.folder}/${pluginName}/bin" failonerror="true" overwrite="false">
-                <fileset dir="${basedir}/bin" includes="**" />
+        <copy todir="${temp.folder}/${distName}/plugins" failonerror="true" overwrite="false">
+            <fileset dir="${plugins.folder}" includes="**"  />
+        </copy>
+        <copy todir="${temp.folder}/${distName}/bin" failonerror="true" overwrite="false">
+            <fileset dir="${basedir}/bin" includes="**" />
+        </copy>
+        <copy todir="${temp.folder}/${distName}" failonerror="true" overwrite="false">
+            <fileset dir="${basedir}" includes="startup.jar,plugin.xml,META-INF/,icons/,plugin.properties,splash.bmp"/>
+        </copy>
+        <copy todir="${temp.folder}/${distName}/configuration" failonerror="true" overwrite="false">
+            <fileset dir="${basedir}/configuration" includes="**"/>
         </copy>
-            <copy todir="${temp.folder}/${pluginName}" failonerror="true" overwrite="false">
-                <fileset dir="${basedir}" includes="startup.jar,plugin.xml,META-INF/,icons/,plugin.properties,splash.bmp"/>
-            </copy>
-            <copy todir="${temp.folder}/${pluginName}/configuration" failonerror="true" overwrite="false">
-                <fileset dir="${basedir}/configuration" includes="**"/>
-            </copy>
         
-            <delete>
-                <fileset dir="${temp.folder}" includes="**/*.bin${logExtension}"/>
-            </delete>
-            <zip destfile="${target.folder}/${pluginName}_${version}.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-            <delete dir="${temp.folder}"/>
-        </target>
+        <delete>
+            <fileset dir="${temp.folder}" includes="**/*.bin${logExtension}"/>
+        </delete>
+        <zip destfile="${target.folder}/${distName}_${version}.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+        <delete dir="${temp.folder}"/>
+    </target>
 
 </project>
diff --git a/java/management/eclipse-plugin/configuration/config.ini b/java/management/eclipse-plugin/configuration/config.ini
index 432f0f1ff5..a0c5d002b0 100644
--- a/java/management/eclipse-plugin/configuration/config.ini
+++ b/java/management/eclipse-plugin/configuration/config.ini
@@ -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.

+###############################################################################

+

 #Product Runtime Configuration File

 

 osgi.splashPath=platform:/base/plugins/org.apache.qpid.management.ui

diff --git a/java/management/eclipse-plugin/plugin.properties b/java/management/eclipse-plugin/plugin.properties
index 77a85f201c..8507441886 100644
--- a/java/management/eclipse-plugin/plugin.properties
+++ b/java/management/eclipse-plugin/plugin.properties
@@ -1,10 +1,20 @@
-aboutText=This RCP Application was generated from\n\
-the PDE Plug-in Project wizard.\n\n\
-This sample shows how to:\n\
-- add a top-level menu and toolbar with actions\n\
-- add keybindings to actions\n\
-- create views that can't be closed and\n\
-  multiple instances of the same view\n\
-- perspectives with placeholders for new views\n\
-- use the default about dialog\n\
-- create a product definition\n
\ 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.
+###############################################################################
+pluginName = Qpid Management Console Plug-in
+providerName = Apache Software Foundation
\ No newline at end of file
diff --git a/java/management/eclipse-plugin/plugin.xml b/java/management/eclipse-plugin/plugin.xml
index 8eda7cdfe3..ed30d73532 100644
--- a/java/management/eclipse-plugin/plugin.xml
+++ b/java/management/eclipse-plugin/plugin.xml
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.2"?>
+<!--
+  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.
+-->
 <plugin>
 
    <extension
@@ -190,7 +208,7 @@
                toolbarPath="qpidActionsGroup"
                tooltip="Reconnect"/>
          <action
-         	   class="org.apache.qpid.management.ui.actions.AddServer"
+               class="org.apache.qpid.management.ui.actions.AddServer"
                definitionId="org.apache.qpid.management.ui.actions.cmd_add"
                icon="icons/add.gif"
                id="org.apache.qpid.management.ui.add"