Permalink
Browse files

This commit was manufactured by cvs2svn to create tag

'rel-2-5-3-RC2'.

git-svn-id: https://source.jasig.org/uPortal/tags/rel-2-5-3-RC2@11230 f5dbab47-78f9-eb45-b975-e544023573eb
  • Loading branch information...
1 parent 0ca3c20 commit b31016bdc61b4461dc5aed4d097b78537787150a infrastructure@lists.ja-sig.org committed Sep 11, 2006
Showing 590 changed files with 16,582 additions and 57,930 deletions.
View
@@ -14,13 +14,13 @@ clean build directories and publish the uPortal build into a configured Tomcat i
accidentally run the build such that it overwrites a uPortal instance you care about. Locations affected by
the build are declared in build.properties.
-
+Backup your work before running builds.
Manifest
----------------------------------------
build.properties o Contains configuration for the build file that needs to
be customized for your environment.
-build.xml o Contains the ant build targets for working with uPortal.
+build.xml o Contains the Ant build targets for working with uPortal.
Ant Depdency
----------------------------------------
@@ -62,7 +62,7 @@ version of the portal is configured.
Logging
---------------------------------------
-The ant build moves /properties/Logger.properties to the root of the classes directory so that the resulting
+The ant build copies /properties/Logger.properties to the root of the classes directory so that the resulting
log4j.properties file will be available on the classpath for Commons Logging / log4j to find. You'll need to either
change that configuration in Logger.properties before the build or to change it in /WEB-INF/classes/ afterwards.
You can configure the logging level, where the file should be, or even choose a different logging approach (log
View
@@ -15,7 +15,7 @@
#==================== File and Directory Names ========================
app.name=uPortal
-app.version=2.5.0-RC3
+app.version=2.5.3-RC1
lib.path=lib
server.home=/JavaClasses/jakarta-tomcat-5.0.28
@@ -35,6 +35,16 @@ deploy.home=${server.home}/webapps/${webapp.docBase}
webapp.contextFile=uPortal.xml
# prototype context file for use with Tomcat 5.5
+#
+# Note that if you use this context file to declare one or more DataSources you would like
+# the Tomcat 5.5 servlet container to instantiate and make available to uPortal via JNDI,
+# you also need to make the .jar files implementing those datasources available to
+# Tomcat 5.5 by installing them into the /common/lib directory of your Tomcat 5.5 instance.
+# Without the required .jar(s), Tomcat will be unable to instantiate the DataSource.
+#
+# The build.xml build process does not currently install the database driver jar
+# (Declared as jdbcDriver.jar below) into Tomcat 5.5 /common/lib. You will need to do this manually.
+#
#webapp.contextFile=uPortal55.xml
#==================== Compilation Control Options =====================
@@ -68,6 +78,7 @@ commons-dbcp.jar=${lib.path}/commons-dbcp-1.2.1.jar
commons-pool.jar=${lib.path}/commons-pool-1.2.jar
servlet.jar=${lib.path}/servlet.jar
spring.jar=${lib.path}/spring.jar
+casclient.jar=${lib.path}/casclient-2.1.1.jar
jaxp.lib=${lib.path}/jaxp
View
@@ -313,6 +313,10 @@
Version CVS_HEAD (4/18/2005)
URL: http://www.mathcs.emory.edu/dcl/util/backport-util-concurrent/
+ casclient.jar Yale's Java CAS client.
+ Version 2.1.1
+ URL: http://www.ibiblio.org/maven/cas/jars/casclient-2.1.1.jar
+
-->
<property name="xalan.jar" value="(set this in build.properties!)"/>
@@ -341,6 +345,7 @@
<property name="jdom.jar" value="{set this in build.properties!)" />
<property name="concurrent.jar" value="{set this in build.properties!)" />
<property name="backport.jar" value="{set this in build.properties!)" />
+ <property name="casclient.jar" value="lib/casclient-2.1.1.jar" />
<!-- ==================== Compilation Classpath =========================== -->
@@ -383,6 +388,7 @@
<pathelement location="${jdom.jar}" />
<pathelement location="${concurrent.jar}" />
<pathelement location="${backport.jar}" />
+ <pathelement location="${casclient.jar}" />
</path>
@@ -475,13 +481,15 @@
destdir="${build.home}/WEB-INF/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
+ target="1.4"
+ source="1.4"
optimize="${compile.optimize}">
<classpath refid="compile.classpath"/>
</javac>
<!-- Copy non-java resources -->
<copy todir="${build.home}/WEB-INF/classes">
- <fileset dir="source" excludes="CVS,**/*.java"/>
+ <fileset dir="source" excludes="CVS,**/*.java,**/package.html"/>
</copy>
<!-- Copy associated resource files -->
@@ -559,6 +567,7 @@
<copy todir="${deploy.home}/WEB-INF/lib" file="${jdom.jar}" />
<copy todir="${deploy.home}/WEB-INF/lib" file="${concurrent.jar}" />
<copy todir="${deploy.home}/WEB-INF/lib" file="${backport.jar}" />
+ <copy todir="${deploy.home}/WEB-INF/lib" file="${casclient.jar}"/>
<!-- These are Tomcat-specific! We need to think about a new property
that lets us specify the appropriate directory for other servers
@@ -695,6 +704,8 @@
<!-- Test that JAXP is installed in the JVM before trying to compile all of uPortal -->
<mkdir dir="${build.home}/WEB-INF/classes"/>
<javac srcdir="source"
+ target="1.4"
+ source="1.4"
destdir="${build.home}/WEB-INF/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
@@ -1221,6 +1232,9 @@
<target name="compiletests" depends="compile"
description="Compile JUnit Tests">
<javac srcdir="tests"
+ target="1.4"
+ source="1.4"
+
destdir="${build.home}/WEB-INF/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
@@ -1245,7 +1259,8 @@
-->
<!-- You must copy junit.jar into $ANT_HOME/lib directory for this to work -->
<target name="runtests" depends="compiletests" description="Run JUnit Test Suite">
- <junit fork="true" printsummary="on" showoutput="off" dir=".." >
+ <junit fork="true" printsummary="off" showoutput="off" dir=".."
+ haltonerror="true" haltonfailure="true">
<classpath>
<pathelement path="${build.home}/WEB-INF/classes"/>
<path refid="tests.classpath"/>
@@ -1259,6 +1274,7 @@
<exclude name="**/DbTest.class"/>
</fileset>
</batchtest>
+ <formatter type="brief" usefile="no"/>
</junit>
</target>
@@ -1346,7 +1362,7 @@
<target name="pubchan" description="Publishes channels" depends="compile">
<echo message="Invoking Channel Publisher Tool"/>
- <property name="channel" value=" "/>
+ <property name="channel" value="all"/>
<java fork="true" failonerror="true" dir="${basedir}" classname="org.jasig.portal.tools.chanpub.ChannelPublisher">
<classpath>
<pathelement path="${build.home}/WEB-INF/classes"/>
@@ -1,14 +0,0 @@
-function swapImage(imageName, type) {
- var newImage = "";
-
- if (type == "on") {
- newImage = imageName + "-on";
- }
- else {
- newImage = imageName + "-off";
- }
-
- if (document.images) {
- document.images[imageName].src = "images/" + newImage + ".gif";
- }
-}
Oops, something went wrong. Retry.

0 comments on commit b31016b

Please sign in to comment.