From e7171f75d5c65ca54322da6671b25d3e77e6ac8b Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann@gmail.com>
Date: Tue, 8 Sep 2009 10:28:52 +0200
Subject: [PATCH] jopt upgrade to 2.3.0

---
 lib/jboss-appliance-support    | 2 +-
 specs/jopr-agent.spec          | 4 ++--
 specs/jopr.spec                | 7 +++++--
 src/preconfigure-jopr-agent.sh | 6 +++---
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/jboss-appliance-support b/lib/jboss-appliance-support
index d429866..d70e2cf 160000
--- a/lib/jboss-appliance-support
+++ b/lib/jboss-appliance-support
@@ -1 +1 @@
-Subproject commit d429866d9cfb7be82a2bc54fc68b06f46729986d
+Subproject commit d70e2cf82776e780595aa19a21123ba35622b1ed
diff --git a/specs/jopr-agent.spec b/specs/jopr-agent.spec
index 5e7e95a..95acfa4 100644
--- a/specs/jopr-agent.spec
+++ b/specs/jopr-agent.spec
@@ -1,9 +1,9 @@
 %define agent_name rhq-enterprise-agent
-%define jopr_version 2.2.1
+%define jopr_version 2.3.0
 
 Summary:        JOPR Agent
 Name:           jopr-agent
-Version:        1.2.1
+Version:        1.3.0
 Release:        1
 License:        LGPL
 BuildArch:      noarch
diff --git a/specs/jopr.spec b/specs/jopr.spec
index 4acd1f9..5c6d769 100644
--- a/specs/jopr.spec
+++ b/specs/jopr.spec
@@ -1,11 +1,11 @@
 Summary:        JOPR
 Name:           jopr
-Version:        2.2.1
+Version:        2.3.0
 Release:        1
 License:        LGPL
 BuildArch:      noarch
 Group:          Applications/System
-Source0:        http://softlayer.dl.sourceforge.net/project/rhq/jopr/jopr-%{version}/jopr-server-%{version}.zip
+Source0:        http://downloads.sourceforge.net/project/rhq/jopr/jopr-%{version}/jopr-server-%{version}.zip
 Source1:        preconfigure-jopr-agent.sh
 Source2:        agent-configuration.xml
 Source3:        jopr.init
@@ -52,5 +52,8 @@ rm -Rf $RPM_BUILD_ROOT
 /
 
 %changelog
+* Tue Sep 08 2009 Marek Goldmann 2.3.0
+- Upgrade to Jopr 2.3.0
+
 * Sat Jul 25 2009 Marek Goldmann 2.2.1
 - Initial packaging
diff --git a/src/preconfigure-jopr-agent.sh b/src/preconfigure-jopr-agent.sh
index 9a9ca24..4f8edd8 100755
--- a/src/preconfigure-jopr-agent.sh
+++ b/src/preconfigure-jopr-agent.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 
 JOPR_HOME=/opt/jopr
-JOPR_VERSION=2.2.1
+JOPR_VERSION=2.3.0
 JOPR_AGENT_NAME=rhq-enterprise-agent
-JOPR_AGENT_VERSION=1.2.1
+JOPR_AGENT_VERSION=1.3.0
 JOPR_CONFIG=/usr/share/jopr/agent-configuration.xml
-JOPR_TMP_DIR=/tmp/jopr-2.2.1
+JOPR_TMP_DIR=/tmp/jopr-$JOPR_VERSION
 
 IP_ADDRESS=`ip addr list eth0 | grep "inet " | cut -d' ' -f6 | cut -d/ -f1`