dev/null |binary
java/buildconf/build-props.xml | 2 +-
java/code/webapp/WEB-INF/pages/yourrhn.jsp | 1 -
java/conf/eclipse/rhn_eclipse_libraries.xml | 1 +
java/ivy.xml | 1 -
java/spacewalk-java.spec | 13 ++++++++++---
rel-eng/packages/spacewalk-java | 2 +-
7 files changed, 13 insertions(+), 7 deletions(-)
New commits:
commit 4869bc8349e296ca6258e486657b5db1d3a92e20
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 30 16:32:36 2012 +0100
Automatic commit of package [spacewalk-java] release [1.9.25-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index c461c38..81fad6f 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.9.24
+Version: 1.9.25
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -620,6 +620,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Nov 30 2012 Tomas Lestach <tlestach(a)redhat.com> 1.9.25-1
+- do not include engine.js twice
+- remove embedded dwr from spacewalk-java and start using dwr package
+
* Fri Nov 30 2012 Jan Pazdziora 1.9.24-1
- Do not use Java keywords.
- 851942 - copy GPG information from the original channel within
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 1589f3a..f964c42 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.24-1 java/
+1.9.25-1 java/
commit 1ba857273324cc8ae969edd7f17465a6b8adc75d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 30 16:31:29 2012 +0100
do not include engine.js twice
causes:
Incomplete reply from server [alert]
diff --git a/java/code/webapp/WEB-INF/pages/yourrhn.jsp
b/java/code/webapp/WEB-INF/pages/yourrhn.jsp
index 9c7eea4..0413b50 100644
--- a/java/code/webapp/WEB-INF/pages/yourrhn.jsp
+++ b/java/code/webapp/WEB-INF/pages/yourrhn.jsp
@@ -33,7 +33,6 @@
<script type="text/javascript"
src="/rhn/dwr/interface/SystemGroupsRenderer.js"></script>
</c:if>
<script type="text/javascript"
src="/javascript/scriptaculous.js"></script>
-<script type="text/javascript"
src="/rhn/dwr/engine.js"></script>
<script type="text/javascript"
src="/javascript/render.js"></script>
</head>
<body>
commit 0378cf83d93a92d067ec30605f87887a336f224a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Nov 29 17:43:26 2012 +0100
remove embedded dwr from spacewalk-java and start using dwr package
diff --git a/java/buildconf/build-props.xml b/java/buildconf/build-props.xml
index a0c8c1d..e3cf661 100644
--- a/java/buildconf/build-props.xml
+++ b/java/buildconf/build-props.xml
@@ -105,7 +105,7 @@
${install.common.jar.dependencies} tanukiwrapper" />
<property name="install.run.jar.dependencies"
- value="antlr ${asm} cglib c3p0 commons-discovery dom4j jaf jta
+ value="antlr ${asm} cglib c3p0 commons-discovery dom4j dwr jaf jta
oscache sitemesh taglibs-standard xalan-j2 xerces-j2
xml-commons-apis ${install.common.jar.dependencies}" />
diff --git a/java/buildconf/tempjars/dwr-2.0.2.jar
b/java/buildconf/tempjars/dwr-2.0.2.jar
deleted file mode 100644
index 8b32cf7..0000000
Binary files a/java/buildconf/tempjars/dwr-2.0.2.jar and /dev/null differ
diff --git a/java/conf/eclipse/rhn_eclipse_libraries.xml
b/java/conf/eclipse/rhn_eclipse_libraries.xml
index 23e9f97..15b9b7d 100644
--- a/java/conf/eclipse/rhn_eclipse_libraries.xml
+++ b/java/conf/eclipse/rhn_eclipse_libraries.xml
@@ -39,6 +39,7 @@
<archive path="/usr/share/java/oscache.jar"/>
<archive path="/usr/share/java/jdom.jar"
source="/rhn-java/code/libsrc/jdom-1.0-src.jar" />
<archive path="/usr/share/java/c3p0.jar"/>
+ <archive path="/usr/share/java/dwr.jar"/>
<archive path="/usr/share/java/jmock.jar"/>
<archive path="/usr/share/java/jmock-cglib.jar"/>
<archive path="/usr/share/java/jpam.jar"/>
diff --git a/java/ivy.xml b/java/ivy.xml
index 60b5fde..07335f6 100644
--- a/java/ivy.xml
+++ b/java/ivy.xml
@@ -71,7 +71,6 @@
<dependency org="redhat" name="xalan-j2"
rev="2.6.0" />
<dependency org="redhat" name="xerces-j2"
rev="2.6.2" />
<dependency org="redhat" name="xml-commons-apis"
rev="1.0" />
- <dependency org="redhat" name="dwr" rev="2.0.2"
/>
<dependency org="redhat" name="slf4j-api"
rev="1.5.10" />
<dependency org="redhat" name="slf4j-log4j12"
rev="1.5.10" />
<dependency org="redhat" name="velocity"
rev="1.5" />
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index b4d8c18..c461c38 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -47,6 +47,7 @@ Requires: jfreechart >= 1.0.9
Requires: bcel
Requires: c3p0
+Requires: dwr
Requires: hibernate3 = 0:3.2.4
Requires: java >= 1:1.6.0
Requires: java-devel >= 1:1.6.0
@@ -122,6 +123,7 @@ BuildRequires: c3p0
BuildRequires: concurrent
BuildRequires: cglib
BuildRequires: dom4j
+BuildRequires: dwr
BuildRequires: hibernate3 = 0:3.2.4
BuildRequires: jaf
BuildRequires: jakarta-commons-cli
@@ -415,6 +417,7 @@ install -m 644 conf/cobbler/snippets/redhat_register
$RPM_BUILD_ROOT%{cobdirsni
ln -s -f /usr/sbin/tanukiwrapper $RPM_BUILD_ROOT%{_bindir}/taskomaticd
ln -s -f %{_javadir}/ojdbc14.jar $RPM_BUILD_ROOT%{jardir}/ojdbc14.jar
+ln -s -f %{_javadir}/dwr.jar $RPM_BUILD_ROOT%{jardir}/dwr.jar
install -d -m 755 $RPM_BUILD_ROOT%{realcobsnippetsdir}
ln -s -f %{cobdirsnippets} $RPM_BUILD_ROOT%{realcobsnippetsdir}/spacewalk
touch $RPM_BUILD_ROOT%{_var}/spacewalk/systemlogs/audit-review.log
@@ -490,7 +493,7 @@ fi
%{appdir}/rhn/WEB-INF/pages
%{appdir}/rhn/WEB-INF/*.xml
# list of all jar symlinks without any version numbers
-# and wildcards (except non-symlinks dwr and velocity)
+# and wildcards (except non-symlink velocity)
%{jardir}/antlr.jar
%{jardir}/bcel.jar
%{jardir}/c3p0.jar
@@ -509,7 +512,7 @@ fi
%{jardir}/commons-validator.jar
%{jardir}/concurrent.jar
%{jardir}/dom4j.jar
-%{jardir}/dwr-*.jar
+%{jardir}/dwr.jar
%{jardir}/hibernate3*
%{jardir}/jaf.jar
%{jardir}/javamail.jar