perfsonar-dev - [GEANT/SA2/ps-java-services] r5468 - in branches/new-structure-with-base2/ps-mdm-web-admin: ant src/main/java/org/perfsonar/webadmin/base2/servlet tomcat tomcat/views
Subject: perfsonar development work
List archive
[GEANT/SA2/ps-java-services] r5468 - in branches/new-structure-with-base2/ps-mdm-web-admin: ant src/main/java/org/perfsonar/webadmin/base2/servlet tomcat tomcat/views
Chronological Thread
- From:
- To:
- Subject: [GEANT/SA2/ps-java-services] r5468 - in branches/new-structure-with-base2/ps-mdm-web-admin: ant src/main/java/org/perfsonar/webadmin/base2/servlet tomcat tomcat/views
- Date: Tue, 26 Jan 2010 12:08:23 GMT
Author: psnc.procyk
Date: 2010-01-26 11:46:31 +0000 (Tue, 26 Jan 2010)
New Revision: 5468
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/ant/
branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/SelfTestServlet.java
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/index.jsp
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/banner.jsp
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/sideBar.jsp
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/welcome.jsp
Log:
.war building improvements
Property changes on: branches/new-structure-with-base2/ps-mdm-web-admin/ant
___________________________________________________________________
Name: svn:ignore
- *
+ ant
Modified: branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml
2010-01-25 13:03:44 UTC (rev 5467)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml
2010-01-26 11:46:31 UTC (rev 5468)
@@ -65,9 +65,9 @@
<dependency groupId="dom4j" artifactId="dom4j"
version="1.6" />
<dependency groupId="jaxen" artifactId="jaxen"
version="1.1" />
<dependency groupId="junit" artifactId="junit"
version="4.7" />
-
-
-
+
+
+
<localRepository refid="local.repository" />
<remoteRepository refid="remote.repository" />
</artifact:dependencies>
@@ -239,7 +239,7 @@
<exclude name="xmldb" />
</fileset>
<fileset dir="${basedir}/lib/repository">
- <exclude name="**/*junit*.jar"/>
+ <exclude name="**/*junit*.jar" />
<include name="**/*.jar" />
</fileset>
<fileset dir="build" includes="*.jar" />
@@ -250,10 +250,13 @@
<mkdir dir="build/war/WEB-INF/lib" />
<mkdir dir="build/war/WEB-INF/classes/perfsonar/conf" />
- <copy todir="build/war">
- <fileset dir="tomcat" excludes="web.xml" />
+ <copy todir="build/war/wa">
+ <fileset dir="tomcat" excludes="web.xml, index.jsp" />
</copy>
+ <copy todir="build/war/" file="tomcat/index.jsp">
+ </copy>
+
<copy todir="build/war/WEB-INF/classes/perfsonar/conf">
<fileset dir="conf/" />
</copy>
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/SelfTestServlet.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/SelfTestServlet.java
2010-01-25 13:03:44 UTC (rev 5467)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/SelfTestServlet.java
2010-01-26 11:46:31 UTC (rev 5468)
@@ -20,7 +20,7 @@
@SuppressWarnings("serial")
public class SelfTestServlet extends HttpServlet {
- private final String SELF_TEST_FILE = "/soapMessages/selfTest.xml";
+ private final String SELF_TEST_FILE = "/wa/soapMessages/selfTest.xml";
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
Modified: branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/index.jsp
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/index.jsp
2010-01-25 13:03:44 UTC (rev 5467)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/index.jsp
2010-01-26 11:46:31 UTC (rev 5468)
@@ -4,12 +4,13 @@
<html>
<head>
<title>perfSONAR Service Web Administration page</title>
- <link rel="stylesheet" type="text/css" href="styles/main.css"/>
- <link rel="stylesheet" type="text/css" href="styles/default.css"/>
+ <link rel="stylesheet" type="text/css" href="wa/styles/main.css"/>
+ <link rel="stylesheet" type="text/css" href="wa/styles/default.css"/>
<meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1">
- <script src="scripts/Service_Admin.js"></script>
+ <script src="wa/scripts/Service_Admin.js"></script>
</head>
<body>
+ <script src="wa/scripts/wz_tooltip.js"></script>
<%
HTMLGenerator htmlGenerator=new HTMLGenerator();
org.perfsonar.webadmin.base2.config.ObjectMap map =
ConfigurationServletHelper.objectMap(getServletContext());
@@ -23,27 +24,27 @@
<div class="adminPanel">
<div class="banner">
-
<%@include
file="views/banner.jsp"%>
+
<%@include
file="wa/views/banner.jsp"%>
</div>
<div class="mainWindow">
<div class="sidebar">
-
<%@include
file="views/sideBar.jsp"%>
+
<%@include
file="wa/views/sideBar.jsp"%>
</div>
<div class="centerWindow">
<%
String pageParam =
request.getParameter("page");
if(map==null){
%>
- <jsp:include page="views/error.jsp"/>
+ <jsp:include page="wa/views/error.jsp"/>
<%
}else if(pageParam != null &&
pageParam.equals("save")){
%>
<% if(request.getParameter("ok")!=null){ %>
- <jsp:include
page="views/configurationSaved.jsp"/>
+ <jsp:include
page="wa/views/configurationSaved.jsp"/>
<% }else { %>
- <jsp:include
page="views/savedFailed.jsp"/>
+ <jsp:include
page="wa/views/savedFailed.jsp"/>
<% } %>
<%
@@ -51,18 +52,18 @@
out.println(request.getAttribute("form"));
}else if(pageParam != null &&
pageParam.equals("selfTest")){
%>
-
<%@include
file="views/selfTest.jsp" %>
+
<%@include
file="wa/views/selfTest.jsp" %>
<%
}else{
%>
-
<%@include
file="views/welcome.jsp" %>
+
<%@include
file="wa/views/welcome.jsp" %>
<%
}
%>
</div>
</div>
<div class="footer">
- <jsp:include page="views/footer.jsp"/>
+ <jsp:include page="wa/views/footer.jsp"/>
</div>
</div>
</body>
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/banner.jsp
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/banner.jsp
2010-01-25 13:03:44 UTC (rev 5467)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/banner.jsp
2010-01-26 11:46:31 UTC (rev 5468)
@@ -6,7 +6,7 @@
<tr>
<td>
<a href="index.jsp" target="_self">
- <img src="graphics/perfsonar_logo.gif"
alt="perfSONAR" width="192" height="94" border="0" align="left"/>
+ <img src="wa/graphics/perfsonar_logo.gif"
alt="perfSONAR" width="192" height="94" border="0" align="left"/>
</a>
</td>
<td
style="text-align:right;padding-right:70px;font-weight:bold;color:#468C46;font-size:14px">
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/sideBar.jsp
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/sideBar.jsp
2010-01-25 13:03:44 UTC (rev 5467)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/sideBar.jsp
2010-01-26 11:46:31 UTC (rev 5468)
@@ -48,5 +48,5 @@
<tr>
</tr>
</table>
-<img src="graphics/logos.gif" alt="perfSONAR project partners"
+<img src="wa/graphics/logos.gif" alt="perfSONAR project partners"
width="117" height="263" border="0" align="top" />
Modified:
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/welcome.jsp
===================================================================
---
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/welcome.jsp
2010-01-25 13:03:44 UTC (rev 5467)
+++
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/welcome.jsp
2010-01-26 11:46:31 UTC (rev 5468)
@@ -6,9 +6,9 @@
<tr>
<td>
<table width="0" border="0" cellpadding="0" cellspacing="0"
- background="graphics/step_1_slice.gif"
class="contenttable">
+ background="wa/graphics/step_1_slice.gif"
class="contenttable">
<tr>
- <td><img src="graphics/step_1_top.gif"
width="350" height="122">
+ <td><img src="wa/graphics/step_1_top.gif"
width="350" height="122">
</td>
</tr>
@@ -36,7 +36,7 @@
<td></td>
</tr>
<tr>
- <td><img src="graphics/step_1_bottom.gif"
width="350"
+ <td><img src="wa/graphics/step_1_bottom.gif"
width="350"
height="18"></td>
</tr>
</table>
@@ -47,9 +47,9 @@
%>
<td>
<table width="0" border="0" cellpadding="0" cellspacing="0"
- background="graphics/step_2_slice.gif"
class="contenttable">
+ background="wa/graphics/step_2_slice.gif"
class="contenttable">
<tr>
- <td><img src="graphics/step_2_top.gif"
width="350" height="118">
+ <td><img src="wa/graphics/step_2_top.gif"
width="350" height="118">
</td>
</tr>
<%
@@ -59,7 +59,7 @@
%>
<tr>
- <td><img src="graphics/step_2_bottom.gif"
width="350"
+ <td><img src="wa/graphics/step_2_bottom.gif"
width="350"
height="18"></td>
</tr>
</table>
- [GEANT/SA2/ps-java-services] r5468 - in branches/new-structure-with-base2/ps-mdm-web-admin: ant src/main/java/org/perfsonar/webadmin/base2/servlet tomcat tomcat/views, svn-noreply, 01/26/2010
Archive powered by MHonArc 2.6.16.