You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2012/05/11 22:48:19 UTC
svn commit: r1337372 - in
/qpid/branches/java-config-and-management/qpid/java: ./
broker-plugins/management/ broker-plugins/management/src/main/java/resources/
Author: rgodfrey
Date: Fri May 11 20:48:19 2012
New Revision: 1337372
URL: http://svn.apache.org/viewvc?rev=1337372&view=rev
Log:
NO-JIRA : [Java Config] Add dojo as a dependency
Modified:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/build.xml
qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/broker.html
qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/connection.html
qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/exchange.html
qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/queue.html
qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/vhost.html
qpid/branches/java-config-and-management/qpid/java/build.deps
qpid/branches/java-config-and-management/qpid/java/common.xml
qpid/branches/java-config-and-management/qpid/java/ivy.retrieve.xml
Modified: qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/build.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/build.xml?rev=1337372&r1=1337371&r2=1337372&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/build.xml (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/build.xml Fri May 11 20:48:19 2012
@@ -25,5 +25,15 @@
<import file="../../module.xml" />
+ <target name="precompile">
+ <unwar src="${project.root}/${dojo}" dest="${module.classes}/resources/dojo">
+ <patternset>
+ <exclude name="META-INF/**"/>
+ <exclude name="WEB-INF/**"/>
+ <exclude name="**/*.uncompressed.js"/>
+ </patternset>
+ </unwar>
+ </target>
+
<target name="bundle" depends="bundle-tasks" />
</project>
Modified: qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/broker.html
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/broker.html?rev=1337372&r1=1337371&r2=1337372&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/broker.html (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/broker.html Fri May 11 20:48:19 2012
@@ -23,24 +23,15 @@
<head>
<meta charset="utf-8">
<title>Broker</title>
- <!--<link rel="stylesheet" href="/dojo/1.7.2/dojo/resources/dojo.css">
- <link rel="stylesheet" href="/dojo/1.7.2/dijit/themes/claro/claro.css">
- <link rel="stylesheet" href="/dojo/1.7.2/dojox/grid/resources/claroGrid.css">-->
- <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dojo/resources/dojo.css">
- <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dijit/themes/claro/claro.css">
- <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dojox/grid/resources/claroGrid.css">
+ <link rel="stylesheet" href="/dojo/dojo/resources/dojo.css">
+ <link rel="stylesheet" href="/dojo/dijit/themes/claro/claro.css">
+ <link rel="stylesheet" href="/dojo/dojox/grid/resources/claroGrid.css">
<link rel="stylesheet" href="../css/broker.css" media="screen">
<link rel="stylesheet" href="css/common.css" media="screen">
- <!-- load dojo and provide config via data attribute
- style="height: 800px"-->
- <!--<script src="/dojo/1.7.2/dojo/dojo.js.uncompressed.js" data-dojo-config="async: true, parseOnLoad: true">
- </script> -->
-
- <script src="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dojo/dojo.js"
- data-dojo-config="async: true, parseOnLoad: true">
+ <script src="/dojo/dojo/dojo.js" data-dojo-config="async: true, parseOnLoad: true">
</script>
<script>
Modified: qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/connection.html
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/connection.html?rev=1337372&r1=1337371&r2=1337372&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/connection.html (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/connection.html Fri May 11 20:48:19 2012
@@ -23,24 +23,15 @@
<head>
<meta charset="utf-8">
<title>Connection</title>
- <!--<link rel="stylesheet" href="/dojo/1.7.2/dojo/resources/dojo.css">
- <link rel="stylesheet" href="/dojo/1.7.2/dijit/themes/claro/claro.css">
- <link rel="stylesheet" href="/dojo/1.7.2/dojox/grid/resources/claroGrid.css">-->
- <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dojo/resources/dojo.css">
- <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dijit/themes/claro/claro.css">
- <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dojox/grid/resources/claroGrid.css">
+ <link rel="stylesheet" href="/dojo/dojo/resources/dojo.css">
+ <link rel="stylesheet" href="/dojo/dijit/themes/claro/claro.css">
+ <link rel="stylesheet" href="/dojo/dojox/grid/resources/claroGrid.css">
<link rel="stylesheet" href="../css/connection.css" media="screen">
<link rel="stylesheet" href="css/common.css" media="screen">
- <!-- load dojo and provide config via data attribute
- style="height: 800px"-->
- <!--<script src="/dojo/1.7.2/dojo/dojo.js.uncompressed.js" data-dojo-config="async: true, parseOnLoad: true">
- </script> -->
-
- <script src="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dojo/dojo.js"
- data-dojo-config="async: true, parseOnLoad: true">
+ <script src="/dojo/dojo/dojo.js" data-dojo-config="async: true, parseOnLoad: true">
</script>
<script>
Modified: qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/exchange.html
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/exchange.html?rev=1337372&r1=1337371&r2=1337372&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/exchange.html (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/exchange.html Fri May 11 20:48:19 2012
@@ -23,24 +23,15 @@
<head>
<meta charset="utf-8">
<title>Exchange</title>
- <!--<link rel="stylesheet" href="/dojo/1.7.2/dojo/resources/dojo.css">
- <link rel="stylesheet" href="/dojo/1.7.2/dijit/themes/claro/claro.css">
- <link rel="stylesheet" href="/dojo/1.7.2/dojox/grid/resources/claroGrid.css">-->
- <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dojo/resources/dojo.css">
- <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dijit/themes/claro/claro.css">
- <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dojox/grid/resources/claroGrid.css">
+ <link rel="stylesheet" href="/dojo/dojo/resources/dojo.css">
+ <link rel="stylesheet" href="/dojo/dijit/themes/claro/claro.css">
+ <link rel="stylesheet" href="/dojo/dojox/grid/resources/claroGrid.css">
<link rel="stylesheet" href="../css/exchange.css" media="screen">
<link rel="stylesheet" href="css/common.css" media="screen">
- <!-- load dojo and provide config via data attribute
- style="height: 800px"-->
- <!--<script src="/dojo/1.7.2/dojo/dojo.js.uncompressed.js" data-dojo-config="async: true, parseOnLoad: true">
- </script> -->
-
- <script src="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dojo/dojo.js"
- data-dojo-config="async: true, parseOnLoad: true">
+ <script src="/dojo/dojo/dojo.js" data-dojo-config="async: true, parseOnLoad: true">
</script>
<script>
Modified: qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/queue.html
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/queue.html?rev=1337372&r1=1337371&r2=1337372&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/queue.html (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/queue.html Fri May 11 20:48:19 2012
@@ -23,25 +23,16 @@
<head>
<meta charset="utf-8">
<title>Queue</title>
- <!--<link rel="stylesheet" href="/dojo/1.7.2/dojo/resources/dojo.css">
- <link rel="stylesheet" href="/dojo/1.7.2/dijit/themes/claro/claro.css">
- <link rel="stylesheet" href="/dojo/1.7.2/dojox/grid/resources/claroGrid.css">-->
- <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dojo/resources/dojo.css">
- <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dijit/themes/claro/claro.css">
- <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dojox/grid/resources/claroGrid.css">
- <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dojox/grid/enhanced/resources/claro/EnhancedGrid.css">
- <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dojox/grid/enhanced/resources/EnhancedGrid_rtl.css">
+ <link rel="stylesheet" href="/dojo/dojo/resources/dojo.css">
+ <link rel="stylesheet" href="/dojo/dijit/themes/claro/claro.css">
+ <link rel="stylesheet" href="/dojo/dojox/grid/resources/claroGrid.css">
+ <link rel="stylesheet" href="/dojo/dojox/grid/enhanced/resources/claro/EnhancedGrid.css">
+ <link rel="stylesheet" href="/dojo/dojox/grid/enhanced/resources/EnhancedGrid_rtl.css">
<link rel="stylesheet" href="../css/queue.css" media="screen">
<link rel="stylesheet" href="css/common.css" media="screen">
- <!-- load dojo and provide config via data attribute
- style="height: 800px"-->
- <!--<script src="/dojo/1.7.2/dojo/dojo.js.uncompressed.js" data-dojo-config="async: true, parseOnLoad: true">
- </script> -->
-
- <script src="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dojo/dojo.js"
- data-dojo-config="async: true, parseOnLoad: true">
+ <script src="/dojo/dojo/dojo.js" data-dojo-config="async: true, parseOnLoad: true">
</script>
<script>
Modified: qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/vhost.html
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/vhost.html?rev=1337372&r1=1337371&r2=1337372&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/vhost.html (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/vhost.html Fri May 11 20:48:19 2012
@@ -23,24 +23,15 @@
<head>
<meta charset="utf-8">
<title>Virtual Host</title>
- <!--<link rel="stylesheet" href="/dojo/1.7.2/dojo/resources/dojo.css">
- <link rel="stylesheet" href="/dojo/1.7.2/dijit/themes/claro/claro.css">
- <link rel="stylesheet" href="/dojo/1.7.2/dojox/grid/resources/claroGrid.css">-->
- <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dojo/resources/dojo.css">
- <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dijit/themes/claro/claro.css">
- <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dojox/grid/resources/claroGrid.css">
+ <link rel="stylesheet" href="/dojo/dojo/resources/dojo.css">
+ <link rel="stylesheet" href="/dojo/dijit/themes/claro/claro.css">
+ <link rel="stylesheet" href="/dojo/dojox/grid/resources/claroGrid.css">
<link rel="stylesheet" href="../css/vhost.css" media="screen">
<link rel="stylesheet" href="css/common.css" media="screen">
- <!-- load dojo and provide config via data attribute
- style="height: 800px"-->
- <!--<script src="/dojo/1.7.2/dojo/dojo.js.uncompressed.js" data-dojo-config="async: true, parseOnLoad: true">
- </script> -->
-
- <script src="http://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dojo/dojo.js"
- data-dojo-config="async: true, parseOnLoad: true">
+ <script src="/dojo/dojo/dojo.js" data-dojo-config="async: true, parseOnLoad: true">
</script>
Modified: qpid/branches/java-config-and-management/qpid/java/build.deps
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/build.deps?rev=1337372&r1=1337371&r2=1337372&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/build.deps (original)
+++ qpid/branches/java-config-and-management/qpid/java/build.deps Fri May 11 20:48:19 2012
@@ -51,6 +51,8 @@ jetty=lib/required/jetty-6.1.14.jar
jetty-util=lib/required/jetty-util-6.1.14.jar
servlet-api=${geronimo-servlet}
+dojo=lib/required/dojo-war-1.7.2.war
+
felix-main=lib/required/org.apache.felix.main-2.0.5.jar
felix.libs=${felix-main}
Modified: qpid/branches/java-config-and-management/qpid/java/common.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/common.xml?rev=1337372&r1=1337371&r2=1337372&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/common.xml (original)
+++ qpid/branches/java-config-and-management/qpid/java/common.xml Fri May 11 20:48:19 2012
@@ -260,8 +260,8 @@
<!-- targets for downloading ivy and retrieving dependencies -->
<target name="retrieve-dependencies" depends="load-ivy, configure-ivy" unless="${ivy.dont.retrieve}">
<echo message="Resolving and retrieving dependencies..."/>
- <ivy:resolve type="jar,bundle" file="${project.root}/ivy.retrieve.xml" conf="required"/>
- <ivy:retrieve type="jar,bundle" conf="required" sync="true"
+ <ivy:resolve type="jar,bundle,war" file="${project.root}/ivy.retrieve.xml" conf="required"/>
+ <ivy:retrieve type="jar,bundle,war" conf="required" sync="true"
pattern="${project.root}/lib/required/[artifact]-[revision].[ext]" />
</target>
Modified: qpid/branches/java-config-and-management/qpid/java/ivy.retrieve.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/ivy.retrieve.xml?rev=1337372&r1=1337371&r2=1337372&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/ivy.retrieve.xml (original)
+++ qpid/branches/java-config-and-management/qpid/java/ivy.retrieve.xml Fri May 11 20:48:19 2012
@@ -58,6 +58,7 @@
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.4" transitive="false"/>
<dependency org="org.mortbay.jetty" name="jetty" rev="6.1.14" transitive="false"/>
<dependency org="org.mortbay.jetty" name="jetty-util" rev="6.1.14" transitive="false"/>
+ <dependency org="org.dojotoolkit" name="dojo-war" rev="1.7.2" transitive="false"/>
<dependency org="xalan" name="xalan" rev="2.7.0" transitive="false"/>
<!-- The following are optional dependencies, for modules providing optional functionlity or
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org