Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r3373 - in trunk/geant2_java-sql-ma: ant conf/axis-1.4 conf/axis-1.4/WEB-INF

Subject: perfsonar development work

List archive

perfsonar: r3373 - in trunk/geant2_java-sql-ma: ant conf/axis-1.4 conf/axis-1.4/WEB-INF


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r3373 - in trunk/geant2_java-sql-ma: ant conf/axis-1.4 conf/axis-1.4/WEB-INF
  • Date: Mon, 18 Feb 2008 08:38:43 -0500
Author: roman
Date: 2008-02-18 08:38:43 -0500 (Mon, 18 Feb 2008)
New Revision: 3373

Modified:
trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml
trunk/geant2_java-sql-ma/ant/libs-download-targets.xml
trunk/geant2_java-sql-ma/conf/axis-1.4/WEB-INF/web.xml
trunk/geant2_java-sql-ma/conf/axis-1.4/index.html
Log:

integrating with the web admin part



Modified: trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml 2008-02-18
13:12:41 UTC (rev 3372)
+++ trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml 2008-02-18
13:38:43 UTC (rev 3373)
@@ -45,7 +45,8 @@
<target name="copy-dep-service-jars"
depends="copy-dep-base-service-jars">

- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20071016/perfsonar-base-1.0.20071016.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080207/perfsonar-base-1.0.20080207.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.6b/perfsonar-web-admin-0.6b.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/2.3.20071009/perfsonar-rrd-ma-2.3.20071009.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar"

todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

@@ -219,6 +220,118 @@


<!--
===================================================================================
-->
+ <!-- targets for web admin installation stuff -->
+
+ <!-- it is assumed that the installation location is /home/perfsonar
directory (user) -->
+
+
+ <property name="tmpdir" value="tmp" />
+
+ <target name="webapp-directory-prepare"
+ xmlns:psbase="psbase:/base.perfsonar.org">
+
+ <delete dir="${tmpdir}"/>
+ <delete dir="${tmpdir}-webapps"/>
+ <mkdir dir="${tmpdir}"/>
+
+
+ <copy file="${basedir}/conf/service.properties.template-2"
tofile="${basedir}/conf/service.properties"/>
+ <copy file="${basedir}/conf/components.properties.template"
tofile="${basedir}/conf/components.properties"/>
+ <copy file="${basedir}/conf/log4j.properties.template"
tofile="${basedir}/conf/log4j.properties"/>
+
+ <copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080207/perfsonar-base-1.0.20080207.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.6b/perfsonar-web-admin-0.6b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/2.3.20071009/perfsonar-rrd-ma-2.3.20071009.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+
+ <copy
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/com/ibatis/ibatis-sqlmap/2.1.7.597/ibatis-sqlmap-2.1.7.597.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/mysql/mysql-connector-java/5.0.3/mysql-connector-java-5.0.3.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/postgresql/postgresql/8.1-407.jdbc3/postgresql-8.1-407.jdbc3.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+
+ <copy todir="${tmpdir}/WEB-INF/classes">
+ <fileset dir="${basedir}/conf">
+ <include name="ibatis-*.xml"/>
+ </fileset>
+ </copy>
+
+ <copy file="${basedir}/conf/eventType-map.xml"
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
+ <copy file="${basedir}/conf/eventType-rules.xml"
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
+
+
+ <property name="service.ma.conf_file"
value="${basedir}/conf/sql-database_TEST.xml" />
+ <copy file="${service.ma.conf_file}"
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
+
+ <copy file="${basedir}/conf/wsdd/${wsdd.file.deploy}"
todir="${tmpdir}/wsdd"/>
+ <copy file="${basedir}/conf/wsdd/${wsdd.file.undeploy}"
todir="${tmpdir}/wsdd"/>
+
+ <copy todir="${tmpdir}/WEB-INF/samples">
+ <fileset dir="${basedir}/samples"/>
+ </copy>
+
+ <copy todir="${tmpdir}/WEB-INF/doc">
+ <fileset dir="${basedir}/doc"/>
+ </copy>
+
+
+ <psbase:copy-dep-base-service-jars dest-jars-path="${tmpdir}"/>
+ <psbase:copy-axis-config dest-conf-path="${tmpdir}"/>
+
+
+ <copy file="${basedir}/conf/axis-1.4/WEB-INF/server-config.wsdd"
todir="${tmpdir}/WEB-INF"/>
+ <copy file="${basedir}/conf/axis-1.4/sqlma_admin_script.js"
todir="${tmpdir}" />
+
+ <replace
file="${tmpdir}/WEB-INF/classes/perfsonar/conf/wizard.properties"
+ token="__BASEPATH__"
+
value="/home/perfsonar/webapps/${service.name}-${version}/WEB-INF" />
+
+ <replace file="${tmpdir}/WEB-INF/classes/perfsonar/conf/log4j.properties"
+ token="_LOGPATH_"
+
value="/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/logs"/>
+
+ <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+
message="service.sax_parser.config=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/objects.config${line.separator}"
+ append="true" />
+
+ <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+
message="service.ma.conf_file=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml${line.separator}"
+ append="true" />
+
+ <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+
message="service.log.log4j.config=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/log4j.properties"
+ append="true" />
+
+ <mkdir dir="${tmpdir}/WEB-INF/logs"/>
+
+ </target>
+
+
+ <target name="war-create"
+ depends="webapp-directory-prepare">
+
+ <zip destfile="${service.name}-${version}.war"
+ basedir="${tmpdir}/"
+ excludes=".svn/**" />
+
+ <delete dir="${tmpdir}"/>
+
+ </target>
+
+
+ <target name="webapp-create"
+ xmlns:psbase="psbase:/base.perfsonar.org"
+ depends="webapp-directory-prepare">
+
+ <move todir="${tmpdir}-webapps/webapps/${service.name}-${version}">
+ <fileset dir="${tmpdir}"/>
+ </move>
+
+ </target>
+
+
+ <!--
===================================================================================
-->
<!-- main targets -->



Modified: trunk/geant2_java-sql-ma/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2_java-sql-ma/ant/libs-download-targets.xml 2008-02-18
13:12:41 UTC (rev 3372)
+++ trunk/geant2_java-sql-ma/ant/libs-download-targets.xml 2008-02-18
13:38:43 UTC (rev 3373)
@@ -54,7 +54,8 @@

<artifact:dependencies>

- <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20071016"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080207"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.6b"/>
<dependency groupId="perfsonar" artifactId="perfsonar-rrd-ma"
version="2.3.20071009"/>
<dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20071008"/>


Modified: trunk/geant2_java-sql-ma/conf/axis-1.4/WEB-INF/web.xml
===================================================================
--- trunk/geant2_java-sql-ma/conf/axis-1.4/WEB-INF/web.xml 2008-02-18
13:12:41 UTC (rev 3372)
+++ trunk/geant2_java-sql-ma/conf/axis-1.4/WEB-INF/web.xml 2008-02-18
13:38:43 UTC (rev 3373)
@@ -44,7 +44,72 @@
<load-on-startup>100</load-on-startup>
</servlet>

+
+
+ <!-- pS extension -->
+ <!-- begin -->
+
+ <servlet>
+ <servlet-name>
+ SQLMAdmin
+ </servlet-name>
+ <servlet-class>
+ perfSONARWebAdmin.admin.sqlma.SQLMAdmin
+ </servlet-class>
+ </servlet>
+
<servlet-mapping>
+ <servlet-name>
+ SQLMAdmin
+ </servlet-name>
+ <url-pattern>
+ /SQLMAdmin
+ </url-pattern>
+ </servlet-mapping>
+
+
+ <servlet>
+ <servlet-name>
+ eXistAdmin
+ </servlet-name>
+ <servlet-class>
+ perfSONARWebAdmin.admin.exist.eXistAdmin
+ </servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>
+ eXistAdmin
+ </servlet-name>
+ <url-pattern>
+ /eXistAdmin
+ </url-pattern>
+ </servlet-mapping>
+
+
+ <servlet>
+ <servlet-name>
+ Wizard
+ </servlet-name>
+ <servlet-class>
+ perfSONARWebAdmin.admin.wizard.Wizard
+ </servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>
+ Wizard
+ </servlet-name>
+ <url-pattern>
+ /Wizard
+ </url-pattern>
+ </servlet-mapping>
+
+ <!-- end -->
+ <!-- pS extension -->
+
+
+ <servlet-mapping>
<servlet-name>AxisServlet</servlet-name>
<url-pattern>/servlet/AxisServlet</url-pattern>
</servlet-mapping>
@@ -84,16 +149,16 @@
<extension>wsdl</extension>
<mime-type>text/xml</mime-type>
</mime-mapping>
-

+
<mime-mapping>
<extension>xsd</extension>
<mime-type>text/xml</mime-type>
</mime-mapping>

<welcome-file-list id="WelcomeFileList">
+ <welcome-file>index.html</welcome-file>
<welcome-file>index.jsp</welcome-file>
- <welcome-file>index.html</welcome-file>
<welcome-file>index.jws</welcome-file>
</welcome-file-list>


Modified: trunk/geant2_java-sql-ma/conf/axis-1.4/index.html
===================================================================
--- trunk/geant2_java-sql-ma/conf/axis-1.4/index.html 2008-02-18 13:12:41
UTC (rev 3372)
+++ trunk/geant2_java-sql-ma/conf/axis-1.4/index.html 2008-02-18 13:38:43
UTC (rev 3373)
@@ -1,21 +1,81 @@
-<html>
-
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta http-equiv="Refresh" content="5;url=index.jsp">
- <title>Apache-Axis</title>
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<h1 align="center">Apache-AXIS</h1>
-
-<blockquote>
- We've moved to an internationalized <a href="index.jsp">top page</a>. The
new URL should be automatically loaded after 5 seconds.<br>
-If you want to visit the new site immediately, please click the above link.
-</blockquote>
-
-<hr>
-Copyright &copy 2005 The Apache Software Foundation. All rights reserved.
-</body>
-</html>
+<html>
+
+ <head>
+ <title>perfSONAR Service Web Administration page</title>
+ <link rel="stylesheet" type="text/css" href="main.css" />
+ <meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1"><style type="text/css">
+<!--
+body,td,th {
+ font-family: arial;
+}
+a:hover {
+ color: #000000;
+}
+-->
+</style></head>
+ <body>
+<div class="adminPanel" >
+
+<div class="banner">
+<table border="0" align="left" cellpadding="0" cellspacing="0">
+<tr>
+ <td><img src="perfsonar_logo.gif" alt="perfSONAR" width="192" height="94"
border="0" align="right"></td>
+</tr>
+</table>
+
+</div>
+
+<div class="mainWindow" >
+
+<div class="sidebar" >
+<table border="0" cellpadding="0" cellspacing="0">
+<tr >
+<th>Administration</th>
+</tr>
+<tr>
+ <td><p><a href="Wizard" target="main" class="navtex" >Service</a></p>
+ <p><a href="Wizard" target="main" class="navtex" >Configuration</a></p>
+ <p><a href="Wizard" target="main" class="navtex" >Wizard</a></p></td>
+</tr>
+<tr>
+ <td><p><a href="ServiceAdmin?serviceProperties" target="main"
class="navtex" >Service</a></p>
+ <p><a href="ServiceAdmin?serviceProperties" target="main" class="navtex"
>configuration</a></p></td>
+</tr>
+<tr>
+ <td>
+ <p><a href="ServiceAdmin?loggingProperties" target="main" class="navtex"
>logging</a></p>
+ <p><a href="ServiceAdmin?loggingProperties" target="main" class="navtex"
>configuration</a>
+ </p>
+ </p></td>
+</tr>
+<tr><td><p><a href="eXistAdmin" target="main" class="navtex" >eXist
Database</a></p>
+ <p><a href="eXistAdmin" target="main" class="navtex"
>Administration</a></p></td>
+</tr>
+<tr><td><p><a href="SQLMAdmin" target="main" class="navtex" >iBatis File
Configuration</a></p></td>
+</tr>
+</table>
+<a href="http://www.perfsonar.net/partners.html";></a> <br>
+<img src="partners.gif" alt="perfSONAR project partners" border="0"/>
</a></div>
+
+<div class="centerWindow" >
+ <object data="http://www.perfsonar.net"; type="text/html" name="main"
width="101%" height="106%" class="main" >
+ <p>Sorry for the inconvenience we are having connectiong to the main
page...</p>
+ </object>
+</div>
+
+
+</div>
+
+<div class="footer" >PERFormance Service-Oriented Network monitoring
ARchitecture &nbsp;</div>
+
+
+
+
+
+</div>
+
+
+ </body>
+</html>
+
+


  • perfsonar: r3373 - in trunk/geant2_java-sql-ma: ant conf/axis-1.4 conf/axis-1.4/WEB-INF, svnlog, 02/18/2008

Archive powered by MHonArc 2.6.16.

Top of Page