xlawrence 2005/01/12 17:30:27 CET
Modified files:
calClient maven.xml project.xml
calClient/webapp/admin project.xml
calClient/webapp/admin/src/webapp/WEB-INF portlet.xml web.xml
calClient/webapp/uiclient project.xml
calClient/webapp/uiclient/src/java log4j.properties
calClient/webapp/uiclient/src/webapp/WEB-INF portlet.xml
web.xml
Log:
Updated config files
Revision Changes Path
1.3 +11 -2 uwcal_JSR168/calClient/maven.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/maven.xml.diff?r1=1.2&r2=1.3&f=h
1.4 +23 -0 uwcal_JSR168/calClient/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/project.xml.diff?r1=1.3&r2=1.4&f=h
1.3 +9 -0 uwcal_JSR168/calClient/webapp/admin/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/admin/project.xml.diff?r1=1.2&r2=1.3&f=h
1.2 +0 -2
uwcal_JSR168/calClient/webapp/admin/src/webapp/WEB-INF/portlet.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/admin/src/webapp/WEB-INF/portlet.xml.diff?r1=1.1&r2=1.2&f=h
1.2 +13 -3
uwcal_JSR168/calClient/webapp/admin/src/webapp/WEB-INF/web.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/admin/src/webapp/WEB-INF/web.xml.diff?r1=1.1&r2=1.2&f=h
1.3 +9 -0 uwcal_JSR168/calClient/webapp/uiclient/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/uiclient/project.xml.diff?r1=1.2&r2=1.3&f=h
1.2 +1 -18
uwcal_JSR168/calClient/webapp/uiclient/src/java/log4j.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/uiclient/src/java/log4j.properties.diff?r1=1.1&r2=1.2&f=h
1.2 +0 -2
uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/portlet.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/portlet.xml.diff?r1=1.1&r2=1.2&f=h
1.2 +9 -23
uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/web.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/web.xml.diff?r1=1.1&r2=1.2&f=h
Index: maven.xml
===================================================================
RCS file: /home/cvs/repository/uwcal_JSR168/calClient/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 11 Jan 2005 09:48:46 -0000 1.2
+++ maven.xml 12 Jan 2005 16:30:25 -0000 1.3
@@ -44,13 +44,22 @@
</java>
</goal>
- <goal name="client" prereqs="java:compile"
+ <goal name="client" prereqs="jar:install"
description="Launches the calendar client application">
<echo message="===================================" />
<echo message=" Calendarclient " />
<echo message="===================================" />
+
+ <echo>Moving conf data for hibernate.</echo>
+ <!-- copy conf data -->
+ <delete file="${maven.build.dest}/hibernate.cfg.xml" />
+ <copy file="${maven.conf.dir}/hibernate.cfg_test.xml"
+ tofile="${maven.build.dest}/hibernate.cfg.xml"/>
+ <copy file="${maven.conf.dir}/eventid.hbm.xml"
toDir="${maven.build.dest}"/>
+
<java classname="org.jahia.suite.calendar.calServer.Calendarclient"
- fork="yes">
+ fork="yes"
+ dir="${maven.build.dir}">
<classpath>
<path refid="maven.dependency.classpath"/>
<pathelement path="${maven.build.dest}"/>
Index: project.xml
===================================================================
RCS file: /home/cvs/repository/uwcal_JSR168/calClient/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 11 Jan 2005 09:48:46 -0000 1.3
+++ project.xml 12 Jan 2005 16:30:25 -0000 1.4
@@ -44,6 +44,14 @@
</properties>
</dependency>
<dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.6.1</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
@@ -272,6 +280,14 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
+ <dependency>
+ <groupId>uwCal</groupId>
+ <artifactId>uwcalwebcommon</artifactId>
+ <version>2.1</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
</dependencies>
<build>
@@ -284,6 +300,13 @@
</includes>
</resource>
<resource>
+ <directory>conf/uwCalResources/properties/calendar</directory>
+ <targetPath>/properties/calendar</targetPath>
+ <includes>
+ <include>*.properties</include>
+ </includes>
+ </resource>
+ <resource>
<directory>conf</directory>
<targetPath>/</targetPath>
<includes>
Index: project.xml
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/admin/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 11 Jan 2005 10:30:31 -0000 1.2
+++ project.xml 12 Jan 2005 16:30:25 -0000 1.3
@@ -55,11 +55,20 @@
</includes>
</resource>
<resource>
+ <directory>src/java/properties/calendar</directory>
+ <targetPath>/properties/calendar</targetPath>
+ <includes>
+ <include>*.properties</include>
+ </includes>
+ </resource>
+<!--
+ <resource>
<directory>../../src/java</directory>
<includes>
<include>hibernate.properties</include>
</includes>
</resource>
+-->
<resource>
<directory>../../conf</directory>
<targetPath>/</targetPath>
Index: portlet.xml
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/admin/src/webapp/WEB-INF/portlet.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- portlet.xml 11 Jan 2005 09:47:08 -0000 1.1
+++ portlet.xml 12 Jan 2005 16:30:26 -0000 1.2
@@ -46,8 +46,6 @@
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
- <portlet-mode>EDIT</portlet-mode>
- <portlet-mode>HELP</portlet-mode>
</supports>
<portlet-info>
<title>UWCal Admin</title>
Index: web.xml
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/admin/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 11 Jan 2005 09:47:08 -0000 1.1
+++ web.xml 12 Jan 2005 16:30:26 -0000 1.2
@@ -18,9 +18,11 @@
<servlet>
<servlet-name>action</servlet-name>
- <servlet-class>
- org.apache.portals.bridges.struts.PortletServlet
- </servlet-class>
+
<servlet-class>org.apache.portals.bridges.struts.PortletServlet</servlet-class>
+ <init-param>
+ <param-name>config</param-name>
+ <param-value>/WEB-INF/struts-config.xml</param-value>
+ </init-param>
<init-param>
<param-name>application</param-name>
<param-value>client</param-value>
@@ -42,6 +44,14 @@
(role-name), which refers to an application specific name
(role-link) -->
+ <init-param>
+ <param-name>debug</param-name>
+ <param-value>9</param-value>
+ </init-param>
+ <init-param>
+ <param-name>detail</param-name>
+ <param-value>9</param-value>
+ </init-param>
<load-on-startup>1</load-on-startup>
<security-role-ref>
Index: project.xml
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/uiclient/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 11 Jan 2005 10:30:31 -0000 1.2
+++ project.xml 12 Jan 2005 16:30:26 -0000 1.3
@@ -55,11 +55,20 @@
</includes>
</resource>
<resource>
+ <directory>src/java/properties/calendar</directory>
+ <targetPath>/properties/calendar</targetPath>
+ <includes>
+ <include>*.properties</include>
+ </includes>
+ </resource>
+<!--
+ <resource>
<directory>../../src/java</directory>
<includes>
<include>hibernate.properties</include>
</includes>
</resource>
+-->
<resource>
<directory>../../conf</directory>
<targetPath>/</targetPath>
Index: log4j.properties
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/uiclient/src/java/log4j.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- log4j.properties 11 Jan 2005 09:47:10 -0000 1.1
+++ log4j.properties 12 Jan 2005 16:30:26 -0000 1.2
@@ -1,18 +1 @@
-# For the general syntax of property based configuration files see the
-# documenation of org.apache.log4j.PropertyConfigurator.
-
-log4j.rootLogger=WARN, A1
-
-# A1 is set to be a ConsoleAppender which outputs to System.out.
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-
-# The conversion pattern uses format specifiers. You might want to
-# change the pattern an watch the output format change.
-log4j.appender.A1.layout.ConversionPattern=%d [%-5p]: %m%n
-#log4j.appender.A1.layout.ConversionPattern=%-4r %-5p [%t] %37c %3x - %m%n
-#log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p: %m%n
-
-log4j.logger.org.jahia.suite.calendar.webApp=INFO
+log4j.logger.org.jahia.suite.calendar.webApp=DEBUG
Index: portlet.xml
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/portlet.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- portlet.xml 11 Jan 2005 09:47:13 -0000 1.1
+++ portlet.xml 12 Jan 2005 16:30:26 -0000 1.2
@@ -46,8 +46,6 @@
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
- <portlet-mode>EDIT</portlet-mode>
- <portlet-mode>HELP</portlet-mode>
</supports>
<portlet-info>
<title>UWCal UI-Client</title>
Index: web.xml
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 11 Jan 2005 09:47:13 -0000 1.1
+++ web.xml 12 Jan 2005 16:30:26 -0000 1.2
@@ -36,9 +36,11 @@
<servlet>
<servlet-name>action</servlet-name>
- <servlet-class>
- org.apache.portals.bridges.struts.PortletServlet
- </servlet-class>
+
<servlet-class>org.apache.portals.bridges.struts.PortletServlet</servlet-class>
+ <init-param>
+ <param-name>config</param-name>
+ <param-value>/WEB-INF/struts-config.xml</param-value>
+ </init-param>
<init-param>
<param-name>application</param-name>
<param-value>client</param-value>
@@ -47,7 +49,10 @@
<param-name>debug</param-name>
<param-value>9</param-value>
</init-param>
-
+ <init-param>
+ <param-name>detail</param-name>
+ <param-value>9</param-value>
+ </init-param>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -112,23 +117,4 @@
</user-data-constraint>
</security-constraint>
- <login-config>
- <auth-method>FORM</auth-method>
- <realm-name>rpiLdap</realm-name>
- <form-login-config>
- <form-login-page>/WEB-INF/jsp/login/login.html</form-login-page>
- <form-error-page>/WEB-INF/jsp/login/error.html</form-error-page>
- </form-login-config>
- </login-config>
-
- <!-- The name rpi/misc/creds is built into the source and mapped onto
- the actual object via container specific methods
- (e.g. for jboss in jboss.xml) -->
-
- <ejb-ref>
- <ejb-ref-name>rpi/misc/creds</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>edu.rpi.cct.misc.credentials.shared.CredentialsHome</home>
- <remote>edu.rpi.cct.misc.credentials.shared.Credentials</remote>
- </ejb-ref>
</web-app>
