perfsonar-dev - [GEANT/SA2/ps-java-services] r5523 - in branches/new-structure-with-base2/ps-mdm-as: . .settings conf conf/axis2/META-INF conf/test/perfsonar/conf packaging packaging/deb packaging/rpm target target/test-classes target/test-classes/org target/test-classes/org/perfsonar target/test-classes/org/perfsonar/tests target/test-classes/org/perfsonar/tests/actions

Subject: perfsonar development work

List archive

[GEANT/SA2/ps-java-services] r5523 - in branches/new-structure-with-base2/ps-mdm-as: . .settings conf conf/axis2/META-INF conf/test/perfsonar/conf packaging packaging/deb packaging/rpm target target/test-classes target/test-classes/org target/test-classes/org/perfsonar target/test-classes/org/perfsonar/tests target/test-classes/org/perfsonar/tests/actions

From:
To:
Subject: [GEANT/SA2/ps-java-services] r5523 - in branches/new-structure-with-base2/ps-mdm-as: . .settings conf conf/axis2/META-INF conf/test/perfsonar/conf packaging packaging/deb packaging/rpm target target/test-classes target/test-classes/org target/test-classes/org/perfsonar target/test-classes/org/perfsonar/tests target/test-classes/org/perfsonar/tests/actions
Date: Thu, 4 Mar 2010 08:57:44 GMT

Author: rediris.montes
Date: 2010-03-04 08:57:44 +0000 (Thu, 04 Mar 2010)
New Revision: 5523

Added:
branches/new-structure-with-base2/ps-mdm-as/.classpath
branches/new-structure-with-base2/ps-mdm-as/.project
branches/new-structure-with-base2/ps-mdm-as/.settings/

branches/new-structure-with-base2/ps-mdm-as/.settings/org.eclipse.jdt.core.prefs

branches/new-structure-with-base2/ps-mdm-as/.settings/org.maven.ide.eclipse.prefs
branches/new-structure-with-base2/ps-mdm-as/packaging/
branches/new-structure-with-base2/ps-mdm-as/packaging/deb/
branches/new-structure-with-base2/ps-mdm-as/packaging/deb/changelog
branches/new-structure-with-base2/ps-mdm-as/packaging/deb/conffiles
branches/new-structure-with-base2/ps-mdm-as/packaging/deb/control
branches/new-structure-with-base2/ps-mdm-as/packaging/deb/copyright
branches/new-structure-with-base2/ps-mdm-as/packaging/deb/docs
branches/new-structure-with-base2/ps-mdm-as/packaging/deb/files
branches/new-structure-with-base2/ps-mdm-as/packaging/deb/install
branches/new-structure-with-base2/ps-mdm-as/packaging/deb/postinst
branches/new-structure-with-base2/ps-mdm-as/packaging/deb/postrm
branches/new-structure-with-base2/ps-mdm-as/packaging/deb/preinst
branches/new-structure-with-base2/ps-mdm-as/packaging/deb/prerm
branches/new-structure-with-base2/ps-mdm-as/packaging/deb/rules
branches/new-structure-with-base2/ps-mdm-as/packaging/rpm/

branches/new-structure-with-base2/ps-mdm-as/packaging/rpm/perfsonar-java-as.specs
branches/new-structure-with-base2/ps-mdm-as/target/
branches/new-structure-with-base2/ps-mdm-as/target/test-classes/
branches/new-structure-with-base2/ps-mdm-as/target/test-classes/org/

branches/new-structure-with-base2/ps-mdm-as/target/test-classes/org/perfsonar/

branches/new-structure-with-base2/ps-mdm-as/target/test-classes/org/perfsonar/tests/

branches/new-structure-with-base2/ps-mdm-as/target/test-classes/org/perfsonar/tests/actions/

branches/new-structure-with-base2/ps-mdm-as/target/test-classes/org/perfsonar/tests/actions/ASAuthNActionTests.class

branches/new-structure-with-base2/ps-mdm-as/target/test-classes/org/perfsonar/tests/actions/ASEchoActionTests.class
Modified:

branches/new-structure-with-base2/ps-mdm-as/conf/axis2/META-INF/services.xml
branches/new-structure-with-base2/ps-mdm-as/conf/configuration.xml

branches/new-structure-with-base2/ps-mdm-as/conf/test/perfsonar/conf/configuration.xml
branches/new-structure-with-base2/ps-mdm-as/pom.xml
Log:
- Adding packaging files: rpm and deb
- Updating some old names such as SimpleService

Added: branches/new-structure-with-base2/ps-mdm-as/.classpath
===================================================================
--- branches/new-structure-with-base2/ps-mdm-as/.classpath
(rev 0)
+++ branches/new-structure-with-base2/ps-mdm-as/.classpath 2010-03-04
08:57:44 UTC (rev 5523)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="bin" path="src/main/java"/>
+ <classpathentry kind="src" output="target/test-classes"
path="src/test/java"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>

Property changes on: branches/new-structure-with-base2/ps-mdm-as/.classpath
___________________________________________________________________
Name: svn:mime-type
+ text/plain

Added: branches/new-structure-with-base2/ps-mdm-as/.project
===================================================================
--- branches/new-structure-with-base2/ps-mdm-as/.project
(rev 0)
+++ branches/new-structure-with-base2/ps-mdm-as/.project 2010-03-04
08:57:44 UTC (rev 5523)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>perfsonar-java-simple-service</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>

Property changes on: branches/new-structure-with-base2/ps-mdm-as/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain

Added:
branches/new-structure-with-base2/ps-mdm-as/.settings/org.eclipse.jdt.core.prefs
===================================================================
---
branches/new-structure-with-base2/ps-mdm-as/.settings/org.eclipse.jdt.core.prefs
(rev 0)
+++
branches/new-structure-with-base2/ps-mdm-as/.settings/org.eclipse.jdt.core.prefs
2010-03-04 08:57:44 UTC (rev 5523)
@@ -0,0 +1,5 @@
+#Wed Feb 17 16:38:51 CET 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain

Added:
branches/new-structure-with-base2/ps-mdm-as/.settings/org.maven.ide.eclipse.prefs
===================================================================
---
branches/new-structure-with-base2/ps-mdm-as/.settings/org.maven.ide.eclipse.prefs
(rev 0)
+++
branches/new-structure-with-base2/ps-mdm-as/.settings/org.maven.ide.eclipse.prefs
2010-03-04 08:57:44 UTC (rev 5523)
@@ -0,0 +1,9 @@
+#Wed Feb 17 16:33:42 CET 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/.settings/org.maven.ide.eclipse.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain

Modified:
branches/new-structure-with-base2/ps-mdm-as/conf/axis2/META-INF/services.xml
===================================================================
---
branches/new-structure-with-base2/ps-mdm-as/conf/axis2/META-INF/services.xml
2010-03-03 15:14:57 UTC (rev 5522)
+++
branches/new-structure-with-base2/ps-mdm-as/conf/axis2/META-INF/services.xml
2010-03-04 08:57:44 UTC (rev 5523)
@@ -1,6 +1,6 @@
-<service name="SimpleService" scope="application">
+<service name="AuthService" scope="application">
<description>
- perfSONAR Simple Service (for tests)
+ perfSONAR Authentication and autorization Service
</description>
<operation name="message">
<messageReceiver
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>

Modified: branches/new-structure-with-base2/ps-mdm-as/conf/configuration.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-as/conf/configuration.xml
2010-03-03 15:14:57 UTC (rev 5522)
+++ branches/new-structure-with-base2/ps-mdm-as/conf/configuration.xml
2010-03-04 08:57:44 UTC (rev 5523)
@@ -13,9 +13,9 @@


<lookupInformation>
- <option name="accessPoint"
value="http://localhost:8080/perfsonar-java-simple-service/services/SimpleService"/>
- 
- <option name="name" value="SimpleService - Echo"/>
+ <option name="accessPoint"
value="http://localhost:8080/perfsonar-java-simple-service/services/AuthService"/>
+ 
+ <option name="name" value="AuthService - Echo"/>
<option name="type" value="Echo"/>
</lookupInformation>

Modified:
branches/new-structure-with-base2/ps-mdm-as/conf/test/perfsonar/conf/configuration.xml
===================================================================
---
branches/new-structure-with-base2/ps-mdm-as/conf/test/perfsonar/conf/configuration.xml
2010-03-03 15:14:57 UTC (rev 5522)
+++
branches/new-structure-with-base2/ps-mdm-as/conf/test/perfsonar/conf/configuration.xml
2010-03-04 08:57:44 UTC (rev 5523)
@@ -14,8 +14,7 @@

<lookupInformation>
<option name="accessPoint"
value="http://localhost:8080/perfsonar-java-as/services/AuthService"/>
- 
- <option name="name" value="SimpleService - Echo"/>
+ <option name="name" value="AuthService - Echo"/>
<option name="type" value="Echo"/>
</lookupInformation>

Added: branches/new-structure-with-base2/ps-mdm-as/packaging/deb/changelog
===================================================================
--- branches/new-structure-with-base2/ps-mdm-as/packaging/deb/changelog
(rev 0)
+++ branches/new-structure-with-base2/ps-mdm-as/packaging/deb/changelog
2010-03-04 08:57:44 UTC (rev 5523)
@@ -0,0 +1,45 @@
+perfsonar-java-as (1.3-1) stable; urgency=low
+
+ * New: Use of new base library (base2)
+ * Change: Removed WebAdmin
+ * Change: Directory structure changed
+ * Change: Url changed
+ * Change: Configuration files changed
+
+ -- Candido Rodriguez
<>
Mon, 03 Aug 2009 12:02:03 +0200
+
+perfsonar-java-as (1.2-4) stable; urgency=low
+
+ * New dependency: sun-java5-jre
+
+ -- Candido Rodriguez
<>
Mon, 03 Aug 2009 12:02:03 +0200
+
+perfsonar-java-as (1.2-3) stable; urgency=low
+
+ * Name folders to old ones
+
+ -- Candido Rodriguez
<>
Wed, 29 Jul 2009 10:02:03 +0200
+
+perfsonar-java-as (1.2-2) stable; urgency=low
+
+ * Moved internal name folders to the new one
+
+ -- Candido Rodriguez
<>
Tue, 7 Jul 2009 10:02:03 +0200
+
+perfsonar-java-as (1.2-1) stable; urgency=low
+
+ * new package name
+
+ -- Candido Rodriguez
<>
Mon, 6 Jul 2009 10:02:03 +0200
+
+geant2-java-as (1.1-1) stable; urgency=low
+
+ * new upstream release
+
+ -- Candido Rodriguez
<>
Mon, 19 Jan 2009 10:02:03 +0200
+
+geant2-java-as (1.0-1) unstable; urgency=low
+
+ * initial release
+
+ -- Candido Rodriguez
<>
Mon, 05 May 2008 14:46:48 +0200

Added: branches/new-structure-with-base2/ps-mdm-as/packaging/deb/conffiles
===================================================================
--- branches/new-structure-with-base2/ps-mdm-as/packaging/deb/conffiles
(rev 0)
+++ branches/new-structure-with-base2/ps-mdm-as/packaging/deb/conffiles
2010-03-04 08:57:44 UTC (rev 5523)
@@ -0,0 +1,5 @@
+/usr/lib/perfsonar/services/perfsonar-java-as/WEB-INF/classes/perfsonar/conf/configuration.xml
+/usr/lib/perfsonar/services/perfsonar-java-as/WEB-INF/classes/perfsonar/conf/configuration-rules.xml
+/usr/lib/perfsonar/services/perfsonar-java-as/WEB-INF/classes/log4j.properties
+/usr/lib/perfsonar/services/perfsonar-java-as/WEB-INF/conf/axis2.xml
+

Added: branches/new-structure-with-base2/ps-mdm-as/packaging/deb/control
===================================================================
--- branches/new-structure-with-base2/ps-mdm-as/packaging/deb/control
(rev 0)
+++ branches/new-structure-with-base2/ps-mdm-as/packaging/deb/control
2010-03-04 08:57:44 UTC (rev 5523)
@@ -0,0 +1,12 @@
+Source: perfsonar-java-as
+Section: web
+Priority: extra
+Maintainer: Candido Rodriguez
<>
+Build-Depends: debhelper (>=5), maven2
+Standards-Version: 3.7.2
+
+Package: perfsonar-java-as
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, tomcat5.5, sun-java5-jre
+Description: Authentication and authorization Service of perfSONAR
+ This is the Authentication and authorization Service. perfSONAR services
can use it in order to checking the authentication or the authorization of
the user/client.

Added: branches/new-structure-with-base2/ps-mdm-as/packaging/deb/copyright
===================================================================
--- branches/new-structure-with-base2/ps-mdm-as/packaging/deb/copyright
(rev 0)
+++ branches/new-structure-with-base2/ps-mdm-as/packaging/deb/copyright
2010-03-04 08:57:44 UTC (rev 5523)
@@ -0,0 +1,30 @@
+This package was debianized by Candido Rodriguez
<>
on
+Mon, 14 Jul 2008 14:10:17 +0200.
+
+It was downloaded from http://www.perfsonar.net
+
+Upstream Author(s):
+
+ Candido Rodriguez
<>
+
+License:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2008, Candido Rodriguez
<>
and
+is licensed under the GPL, see above.

Added: branches/new-structure-with-base2/ps-mdm-as/packaging/deb/docs
===================================================================

Added: branches/new-structure-with-base2/ps-mdm-as/packaging/deb/files
===================================================================
--- branches/new-structure-with-base2/ps-mdm-as/packaging/deb/files
(rev 0)
+++ branches/new-structure-with-base2/ps-mdm-as/packaging/deb/files
2010-03-04 08:57:44 UTC (rev 5523)
@@ -0,0 +1 @@
+perfsonar-java-as_1.3-1_all.deb web extra

Added: branches/new-structure-with-base2/ps-mdm-as/packaging/deb/install
===================================================================
--- branches/new-structure-with-base2/ps-mdm-as/packaging/deb/install
(rev 0)
+++ branches/new-structure-with-base2/ps-mdm-as/packaging/deb/install
2010-03-04 08:57:44 UTC (rev 5523)
@@ -0,0 +1,5 @@
+build/perfsonar-java-as/* /usr/lib/perfsonar/services/perfsonar-java-as
+build/perfsonar-java-as/WEB-INF/lib/xalan-2.7.0.jar
/usr/share/tomcat5.5/common/endorsed
+build/perfsonar-java-as/WEB-INF/lib/xalan-serializer-2.7.0.jar
/usr/share/tomcat5.5/common/endorsed
+build/perfsonar-java-as/WEB-INF/lib/xercesImpl-2.8.0.jar
/usr/share/tomcat5.5/common/endorsed
+build/perfsonar-java-as/WEB-INF/lib/xerces-xml-apis-2.8.0.jar
/usr/share/tomcat5.5/common/endorsed

Added: branches/new-structure-with-base2/ps-mdm-as/packaging/deb/postinst
===================================================================
--- branches/new-structure-with-base2/ps-mdm-as/packaging/deb/postinst
(rev 0)
+++ branches/new-structure-with-base2/ps-mdm-as/packaging/deb/postinst
2010-03-04 08:57:44 UTC (rev 5523)
@@ -0,0 +1,59 @@
+#!/bin/sh
+# postinst script for geant2-java-as
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <postinst> `abort-remove'
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ configure)
+ if [ -h /var/lib/tomcat5.5/webapps/perfsonar-java-as ]
+ then
+ rm /var/lib/tomcat5.5/webapps/perfsonar-java-as
+ fi
+ ln -sf /usr/lib/perfsonar/services/perfsonar-java-as
/var/lib/tomcat5.5/webapps || true
+ if [ -h /etc/perfsonar-java-as ]
+ then
+ rm /etc/perfsonar-java-as
+ fi
+ ln -sf
/usr/lib/perfsonar/services/perfsonar-java-as/WEB-INF/classes/perfsonar/conf
/etc/perfsonar-java-as || true
+ if [ -h /var/log/perfsonar-java-as ]
+ then
+ rm /var/log/perfsonar-java-as
+ fi
+ mkdir -p /usr/lib/perfsonar/services/perfsonar-java-as/WEB-INF/log
+ ln -sf /usr/lib/perfsonar/services/perfsonar-java-as/WEB-INF/log
/var/log/perfsonar-java-as || true
+ chown -R tomcat55 /usr/lib/perfsonar/services/perfsonar-java-as
+ /etc/init.d/tomcat5.5 restart
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Added: branches/new-structure-with-base2/ps-mdm-as/packaging/deb/postrm
===================================================================
--- branches/new-structure-with-base2/ps-mdm-as/packaging/deb/postrm
(rev 0)
+++ branches/new-structure-with-base2/ps-mdm-as/packaging/deb/postrm
2010-03-04 08:57:44 UTC (rev 5523)
@@ -0,0 +1,54 @@
+#!/bin/sh
+# postrm script for ps-mdm-flowsub-mp
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postrm> `remove'
+# * <postrm> `purge'
+# * <old-postrm> `upgrade' <new-version>
+# * <new-postrm> `failed-upgrade' <old-version>
+# * <new-postrm> `abort-install'
+# * <new-postrm> `abort-install' <old-version>
+# * <new-postrm> `abort-upgrade' <old-version>
+# * <disappearer's-postrm> `disappear' <overwriter>
+# <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ purge)
+ if [ -h /var/lib/tomcat5.5/webapps/geant2-java-as ]
+ then
+ rm /var/lib/tomcat5.5/webapps/geant2-java-as
+ fi
+ if [ -h /etc/geant2-java-as ]
+ then
+ rm /etc/geant2-java-as
+ fi
+ if [ -h /var/log/geant2-java-as ]
+ then
+ rm /var/log/geant2-java-as
+ fi
+ ;;
+
+ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Added: branches/new-structure-with-base2/ps-mdm-as/packaging/deb/preinst
===================================================================
--- branches/new-structure-with-base2/ps-mdm-as/packaging/deb/preinst
(rev 0)
+++ branches/new-structure-with-base2/ps-mdm-as/packaging/deb/preinst
2010-03-04 08:57:44 UTC (rev 5523)
@@ -0,0 +1,37 @@
+#!/bin/sh
+# preinst script for geant2-java-as
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <new-preinst> `install'
+# * <new-preinst> `install' <old-version>
+# * <new-preinst> `upgrade' <old-version>
+# * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ install|upgrade)
+ ;;
+
+ abort-upgrade)
+ ;;
+
+ *)
+ echo "preinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Added: branches/new-structure-with-base2/ps-mdm-as/packaging/deb/prerm
===================================================================
--- branches/new-structure-with-base2/ps-mdm-as/packaging/deb/prerm
(rev 0)
+++ branches/new-structure-with-base2/ps-mdm-as/packaging/deb/prerm
2010-03-04 08:57:44 UTC (rev 5523)
@@ -0,0 +1,40 @@
+#!/bin/sh
+# prerm script for geant2-java-as
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <prerm> `remove'
+# * <old-prerm> `upgrade' <new-version>
+# * <new-prerm> `failed-upgrade' <old-version>
+# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+# * <deconfigured's-prerm> `deconfigure' `in-favour'
+# <package-being-installed> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ remove|upgrade|deconfigure)
+ ;;
+
+ failed-upgrade)
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Added: branches/new-structure-with-base2/ps-mdm-as/packaging/deb/rules
===================================================================
--- branches/new-structure-with-base2/ps-mdm-as/packaging/deb/rules
(rev 0)
+++ branches/new-structure-with-base2/ps-mdm-as/packaging/deb/rules
2010-03-04 08:57:44 UTC (rev 5523)
@@ -0,0 +1,58 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=0
+
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ # Add here commands to configure the package.
+ touch configure-stamp
+
+
+build: build-stamp
+
+
+build-stamp: configure-stamp
+ dh_testdir
+ mvn package
+
+ touch $@
+
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ rm -rf build
+ dh_clean
+
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+
+binary:
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ dh_installexamples
+ dh_install
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+
+.PHONY: build clean binary install configure

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/packaging/deb/rules
___________________________________________________________________
Name: svn:executable
+ *

Added:
branches/new-structure-with-base2/ps-mdm-as/packaging/rpm/perfsonar-java-as.specs
===================================================================
---
branches/new-structure-with-base2/ps-mdm-as/packaging/rpm/perfsonar-java-as.specs
(rev 0)
+++
branches/new-structure-with-base2/ps-mdm-as/packaging/rpm/perfsonar-java-as.specs
2010-03-04 08:57:44 UTC (rev 5523)
@@ -0,0 +1,153 @@
+# This is where all tomcat stuff will be installed
+%define prefix /usr/lib/perfsonar/services/%{name}
+
+# The full name of your package.
+Name: perfsonar-java-as
+
+# Version of the microrelease
+Version: 1.3
+License: GPL
+
+# Package version. Increment if you create a new package of same microrelease
+Release: 1
+
+# short description of the package
+Summary: perfSONAR Authentication and authorization Service
+
+# The name of the source tarbal
+Source0: %{name}-%{version}.tar.gz
+
+# what should be used for buildpath, you don't need to change this
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
+
+# in what RPM group will the RPM be installed, don't need to change
+Group: Network/Web service
+
+# YOU
+packager: Candido Rodriguez
<>
+
+# What is the location of the source package
+URL: http://www.perfsonar.org
+
+# on what packages should the resulting package depend
+Requires: tomcat5
+
+# For what architecture is this package ment
+BuildArch: noarch
+
+# What RPM packages are needed during build
+BuildRequires: maven2
+
+
+#describe your package here
+%description
+ This is the Authentication and authorization Service. perfSONAR services
can use it in order to checking the authentication or the authorization of
the user/client.
+
+
+
+
+# preperation section of the packaging
+%prep
+# clean up the build dir
+%{__rm} -rf ${RPM_BUILD_DIR}/%{name}-%{version}
+# extract the tarball
+%setup -q
+
+
+# build section
+%build
+pushd ${RPM_BUILD_DIR}/%{name}-%{version}
+ # we use maven to build our stuff. this will build in {source}/build
+ mvn package
+popd
+
+
+%install
+# make the package fake root folder
+rm -rf $RPM_BUILD_ROOT
+
+# Create the package structure
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/log
+
+# copy the service content to the tomcat webapps directory
+pushd ${RPM_BUILD_DIR}/%{name}-%{version}/build
+ %{__cp} -a %{name}/* ${RPM_BUILD_ROOT}%{prefix}
+popd
+
+# post section, executed after installation
+%post
+# make symlink for easy access to conf
+%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/* %{_sysconfdir}/%{name}
+%{__ln_s} %{prefix}/WEB-INF/log/ %{_var}/log/%{name}
+%{__ln_s} %{prefix} %{_var}/lib/tomcat5/webapps
+%{__ln_s} %{prefix}/WEB-INF/lib/xalan-2.7.0.jar
%{_var}/lib/tomcat5/common/endorsed
+%{__ln_s} %{prefix}/WEB-INF/lib/xalan-serializer-2.7.0.jar
%{_var}/lib/tomcat5/common/endorsed
+%{__ln_s} %{prefix}/WEB-INF/lib/xercesImpl-2.8.0.jar
%{_var}/lib/tomcat5/common/endorsed
+%{__ln_s} %{prefix}/WEB-INF/lib/xerces-xml-apis-2.8.0.jar
%{_var}/lib/tomcat5/common/endorsed
+# restart tomcat
+/sbin/service tomcat5 restart
+
+
+# executed before uninstallation
+%preun
+## remove symlink
+%{__rm} -rf %{_sysconfdir}/%{name}/
+%{__rm} -rf %{_var}/log/%{name}
+%{__rm} -rf %{_var}/lib/tomcat5/webapps/%{name}
+%{__rm} -f %{_var}/lib/tomcat5/common/endorsed/xalan-2.7.0.jar
+%{__rm} -f %{_var}/lib/tomcat5/common/endorsed/xalan-serializer-2.7.0.jar
+%{__rm} -f %{_var}/lib/tomcat5/common/endorsed/xercesImpl-2.8.0.jar
+%{__rm} -f %{_var}/lib/tomcat5/common/endorsed/xerces-xml-apis-2.8.0.jar
+
+# executed after uninstallation
+%postun
+## restart tomcat
+/sbin/service tomcat5 restart
+
+
+# clean section for cleanup of source
+%clean
+# clean up the durt
+rm -rf $RPM_BUILD_ROOT
+
+# files section, defines the files that are included and their properties
+%files
+# default attributes
+%defattr(0644,root,tomcat,0755)
+#%attr(755,tomcat,tomcat) %{_var}/run/%{name}
+%attr(755,tomcat,tomcat) %{prefix}/WEB-INF/log
+%attr(660,tomcat,tomcat) %config(noreplace)
%{prefix}/WEB-INF/classes/perfsonar/conf/*
+%{prefix}
+%{_sysconfdir}/%{name}
+
+# Don't forget to add a chanlog entry every time you change the package!
+%changelog
+* Wed Mar 03 2010 Candido Rodriguez
<>
1.3-1
+- New: Use of the new base library (base2)
+- Change: WebAdmin removed
+- Change: Directory structure changed
+- Change: URL changed
+- Change: Configuration files changed
+
+* Mon Aug 03 2009 Candido Rodriguez
<>
1.2-3
+- It copies and erases the endorsed libraries for Tomcat5
+
+* Wed Jul 29 2009 Candido Rodriguez
<>
1.2-2
+- Moving internal paths to old ones
+
+* Tue Jul 07 2009 Candido Rodriguez
<>
1.2-1
+- Change name of the package
+
+* Mon Jan 19 2009 Candido Rodriguez
<>
1.1-1
+- Adds support for self tests
+- Adds support for syslog
+- Uses the webadmin 0.9.6b
+- Uses the perfsonar-base-ant-1.0.20080416
+- Uses edugain 0.7alpha
+
+* Mon May 05 2008 Candido Rodriguez
<>
1.0-1
+- first release
+

Modified: branches/new-structure-with-base2/ps-mdm-as/pom.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-as/pom.xml 2010-03-03 15:14:57
UTC (rev 5522)
+++ branches/new-structure-with-base2/ps-mdm-as/pom.xml 2010-03-04 08:57:44
UTC (rev 5523)
@@ -24,11 +24,11 @@

<modelVersion>4.0.0</modelVersion>
<groupId>perfsonar</groupId>
- <artifactId>perfsonar-java-simple-service</artifactId>
+ <artifactId>perfsonar-java-as</artifactId>
<packaging>war</packaging>
- <name>Simple Service</name>
- <version>1.0</version>
- <description>Example perfSONAR service with base2 library.</description>
+ <name>Authentication and Authorization Service</name>
+ <version>1.2</version>
+ <description>Authentication and Authorization Service</description>
<url>http://wiki.perfsonar.net</url>

<issueManagement>
@@ -209,7 +209,7 @@
<dependency>
<groupId>perfsonar</groupId>
<artifactId>ps-mdm-base2</artifactId>
- <version>0.0.2</version>
+ <version>0.0.3</version>
</dependency>
<dependency>
<groupId>commons-digester</groupId>
@@ -246,7 +246,7 @@
<dependency>
<groupId>edugain</groupId>
<artifactId>edugain</artifactId>
- <version>1.0-RC2</version>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>

Added:
branches/new-structure-with-base2/ps-mdm-as/target/test-classes/org/perfsonar/tests/actions/ASAuthNActionTests.class
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/target/test-classes/org/perfsonar/tests/actions/ASAuthNActionTests.class
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
branches/new-structure-with-base2/ps-mdm-as/target/test-classes/org/perfsonar/tests/actions/ASEchoActionTests.class
===================================================================
(Binary files differ)

Property changes on:
branches/new-structure-with-base2/ps-mdm-as/target/test-classes/org/perfsonar/tests/actions/ASEchoActionTests.class
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

[GEANT/SA2/ps-java-services] r5523 - in branches/new-structure-with-base2/ps-mdm-as: . .settings conf conf/axis2/META-INF conf/test/perfsonar/conf packaging packaging/deb packaging/rpm target target/test-classes target/test-classes/org target/test-classes/org/perfsonar target/test-classes/org/perfsonar/tests target/test-classes/org/perfsonar/tests/actions, svn-noreply, 03/04/2010

List archive