[portal-commits] JBoss Portal SVN: r9004 - in branches/UIServer: build/ide/intellij/idea60 and 8 other directories.

portal-commits at lists.jboss.org portal-commits at lists.jboss.org
Sat Nov 17 19:52:27 EST 2007


Author: julien at jboss.com
Date: 2007-11-17 19:52:27 -0500 (Sat, 17 Nov 2007)
New Revision: 9004

Added:
   branches/UIServer/build/ide/intellij/idea60/modules/core-uiserver/
   branches/UIServer/build/ide/intellij/idea60/modules/core-uiserver/core-uiserver.iml
   branches/UIServer/build/ide/intellij/idea60/modules/uiserver/
   branches/UIServer/build/ide/intellij/idea60/modules/uiserver/uiserver.iml
   branches/UIServer/core-uiserver/
   branches/UIServer/core-uiserver/.classpath
   branches/UIServer/core-uiserver/.cvsignore
   branches/UIServer/core-uiserver/.project
   branches/UIServer/core-uiserver/build.bat
   branches/UIServer/core-uiserver/build.sh
   branches/UIServer/core-uiserver/build.xml
   branches/UIServer/core-uiserver/src/
   branches/UIServer/core-uiserver/src/main/
   branches/UIServer/core-uiserver/src/main/org/
   branches/UIServer/core-uiserver/src/main/org/jboss/
   branches/UIServer/core-uiserver/src/main/org/jboss/portal/
   branches/UIServer/core-uiserver/src/resources/
Modified:
   branches/UIServer/build/ide/intellij/idea60/jboss-portal.ipr
Log:
resurrect core-uiserver to contain the actual impl of uiserver for core in order to get a separate deployment life cycle

Modified: branches/UIServer/build/ide/intellij/idea60/jboss-portal.ipr
===================================================================
--- branches/UIServer/build/ide/intellij/idea60/jboss-portal.ipr	2007-11-18 00:28:24 UTC (rev 9003)
+++ branches/UIServer/build/ide/intellij/idea60/jboss-portal.ipr	2007-11-18 00:52:27 UTC (rev 9004)
@@ -129,6 +129,32 @@
     <option name="FILTER_INFO" value="true" />
     <option name="CUSTOM_FILTER" />
   </component>
+  <component name="MavenBuildProjectComponent">
+    <option name="mavenExecutable" value="" />
+    <option name="Settings File" value="/Users/julien/.m2/settings.xml" />
+    <option name="mavenCommandLineParams" value="" />
+    <option name="vmOptions" value="" />
+    <option name="useMavenEmbedder" value="false" />
+    <option name="useFilter" value="false" />
+    <option name="Batch Mode" value="false" />
+    <option name="Check Plugin Updates" value="false" />
+    <option name="Debug" value="false" />
+    <option name="Errors" value="false" />
+    <option name="Fail At End" value="false" />
+    <option name="Fail Fast" value="false" />
+    <option name="Fail Never" value="false" />
+    <option name="Lax Checksums" value="false" />
+    <option name="No Plugin Registry" value="false" />
+    <option name="No Plugin Updates" value="false" />
+    <option name="Non Recursive" value="false" />
+    <option name="Offline" value="false" />
+    <option name="Reactor" value="false" />
+    <option name="Strict Checksums" value="false" />
+    <option name="Update Plugins" value="false" />
+    <option name="Update Snapshots" value="false" />
+    <option name="Skip Tests" value="false" />
+    <pom-list />
+  </component>
   <component name="Palette2">
     <group name="Swing">
       <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
@@ -254,7 +280,6 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/api/api.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/api/api.iml" />
       <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/bridge/bridge.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/bridge/bridge.iml" />
-      <module fileurl="file://$PROJECT_DIR$/build/build.iml" filepath="$PROJECT_DIR$/build/build.iml" />
       <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/cms/cms.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/cms/cms.iml" />
       <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/common/common.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/common/common.iml" />
       <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/core/core.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/core/core.iml" />
@@ -262,6 +287,7 @@
       <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-cms/core-cms.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-cms/core-cms.iml" />
       <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-management/core-management.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-management/core-management.iml" />
       <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-samples/core-samples.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-samples/core-samples.iml" />
+      <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-uiserver/core-uiserver.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-uiserver/core-uiserver.iml" />
       <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/faces/faces.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/faces/faces.iml" />
       <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/format/format.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/format/format.iml" />
       <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/identity/identity.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/identity/identity.iml" />
@@ -278,12 +304,14 @@
       <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/theme/theme.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/theme/theme.iml" />
       <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml" />
       <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/tools/tools.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/tools/tools.iml" />
+      <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/uiserver/uiserver.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/uiserver/uiserver.iml" />
+      <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/web/web.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/web/web.iml" />
       <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/widget/widget.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/widget/widget.iml" />
       <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/workflow/workflow.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/workflow/workflow.iml" />
       <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/wsrp/wsrp.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/wsrp/wsrp.iml" />
     </modules>
   </component>
-  <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="false" project-jdk-name="1.5" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/output" />
   </component>
   <component name="ProjectRunConfigurationManager" />

Added: branches/UIServer/build/ide/intellij/idea60/modules/core-uiserver/core-uiserver.iml
===================================================================
--- branches/UIServer/build/ide/intellij/idea60/modules/core-uiserver/core-uiserver.iml	                        (rev 0)
+++ branches/UIServer/build/ide/intellij/idea60/modules/core-uiserver/core-uiserver.iml	2007-11-18 00:52:27 UTC (rev 9004)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+  <component name="ModuleRootManager" />
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../../../../../core-uiserver">
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../../core-uiserver/src/main" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="uiserver" />
+    <orderEntryProperties />
+  </component>
+</module>
+

Added: branches/UIServer/build/ide/intellij/idea60/modules/uiserver/uiserver.iml
===================================================================
--- branches/UIServer/build/ide/intellij/idea60/modules/uiserver/uiserver.iml	                        (rev 0)
+++ branches/UIServer/build/ide/intellij/idea60/modules/uiserver/uiserver.iml	2007-11-18 00:52:27 UTC (rev 9004)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+  <component name="ModuleRootManager" />
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../../../../../uiserver">
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../../uiserver/src/main" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="api" />
+    <orderEntry type="module" module-name="common" />
+    <orderEntry type="module" module-name="server" />
+    <orderEntry type="module" module-name="web" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/sun-servlet/lib/servlet-api.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-log4j/lib/log4j.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/gwt/lib/gwt-user.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntryProperties />
+  </component>
+</module>
+

Added: branches/UIServer/core-uiserver/.classpath
===================================================================
--- branches/UIServer/core-uiserver/.classpath	                        (rev 0)
+++ branches/UIServer/core-uiserver/.classpath	2007-11-18 00:52:27 UTC (rev 9004)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/common"/>
+	<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/test"/>
+	<classpathentry kind="lib" path="/thirdparty/apache-httpclient/lib/commons-httpclient.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/jems"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/web"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/backport-concurrent/lib/jboss-backport-concurrent.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>


Property changes on: branches/UIServer/core-uiserver/.classpath
___________________________________________________________________
Name: svn:executable
   + *

Added: branches/UIServer/core-uiserver/.cvsignore
===================================================================
--- branches/UIServer/core-uiserver/.cvsignore	                        (rev 0)
+++ branches/UIServer/core-uiserver/.cvsignore	2007-11-18 00:52:27 UTC (rev 9004)
@@ -0,0 +1,2 @@
+bin
+output


Property changes on: branches/UIServer/core-uiserver/.cvsignore
___________________________________________________________________
Name: svn:executable
   + *

Added: branches/UIServer/core-uiserver/.project
===================================================================
--- branches/UIServer/core-uiserver/.project	                        (rev 0)
+++ branches/UIServer/core-uiserver/.project	2007-11-18 00:52:27 UTC (rev 9004)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>server</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>


Property changes on: branches/UIServer/core-uiserver/.project
___________________________________________________________________
Name: svn:executable
   + *

Added: branches/UIServer/core-uiserver/build.bat
===================================================================
--- branches/UIServer/core-uiserver/build.bat	                        (rev 0)
+++ branches/UIServer/core-uiserver/build.bat	2007-11-18 00:52:27 UTC (rev 9004)
@@ -0,0 +1,54 @@
+ at echo off
+rem
+rem  Invokes a script of the same name in the 'tools' module.
+rem  
+rem  The 'tools' module is expected to be a peer directory of the directory
+rem  in which this script lives.
+rem
+rem  @author Jason Dillon <jason at planet57.com>
+rem
+
+rem $Id: build.bat 21 2005-01-14 23:14:21Z vietj $
+
+setlocal
+
+set PROGNAME=%~nx0
+set DIRNAME=%~dp0
+
+rem Legacy shell support
+if x%PROGNAME%==x set PROGNAME=build.bat
+if x%DIRNAME%==x set DIRNAME=.\
+
+set MODULE_ROOT=%DIRNAME%
+if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools
+set TARGET=%TOOLS_ROOT%\bin\build.bat
+set ARGS=%*
+
+rem Start'er up yo
+goto main
+
+:debug
+if not x%DEBUG%==x echo %PROGNAME%: %*
+goto :EOF
+
+:main
+call :debug PROGNAME=%PROGNAME%
+call :debug DIRNAME=%DIRNAME%
+call :debug TOOLS_ROOT=%TOOLS_ROOT%
+call :debug TARGET=%TARGET%
+
+if exist %TARGET% call :call-script & goto :EOF
+rem else fail, we can not go on
+
+echo %PROGNAME%: *ERROR* The target executable does not exist:
+echo %PROGNAME%:
+echo %PROGNAME%:    %TARGET%
+echo %PROGNAME%:
+echo %PROGNAME%: Please make sure you have checked out the 'tools' module
+echo %PROGNAME%: and make sure it is up to date.
+goto :EOF
+
+:call-script
+call :debug Executing %TARGET% %ARGS%
+call %TARGET% %ARGS%
+goto :EOF


Property changes on: branches/UIServer/core-uiserver/build.bat
___________________________________________________________________
Name: svn:executable
   + *

Added: branches/UIServer/core-uiserver/build.sh
===================================================================
--- branches/UIServer/core-uiserver/build.sh	                        (rev 0)
+++ branches/UIServer/core-uiserver/build.sh	2007-11-18 00:52:27 UTC (rev 9004)
@@ -0,0 +1,49 @@
+#!/bin/sh
+##
+##  Invokes a script of the same name in the 'tools' module.
+##  
+##  The 'tools' module is expected to be a peer directory of the directory
+##  in which this script lives.
+##
+##  @author Jason Dillon <jason at planet57.com>
+##
+
+# $Id: build.sh 21 2005-01-14 23:14:21Z vietj $
+
+PROGNAME=`basename $0`
+DIRNAME=`dirname $0`
+
+# Buss it yo
+main() {
+    if [ "x$TOOLS_ROOT" = "x" ]; then
+	TOOLS_ROOT=`cd $DIRNAME/../tools && pwd`
+    fi
+
+    MODULE_ROOT=`cd $DIRNAME; pwd`
+    export TOOLS_ROOT MODULE_ROOT DEBUG TRACE
+
+    # Where is the target script?
+    target="$TOOLS_ROOT/bin/$PROGNAME"
+    if [ ! -f "$target" ]; then
+	echo "${PROGNAME}: *ERROR* The target executable does not exist:"
+        echo "${PROGNAME}:"
+        echo "${PROGNAME}:    $target"
+        echo "${PROGNAME}:"
+	echo "${PROGNAME}: Please make sure you have checked out the 'tools' module"
+	echo "${PROGNAME}: and make sure it is up to date."
+        exit 2
+    fi
+
+    # Get busy yo!
+    if [ "x$DEBUG" != "x" ]; then
+	echo "${PROGNAME}: Executing: /bin/sh $target $@"
+    fi
+    if [ "x$TRACE" = "x" ]; then
+	exec /bin/sh $target "$@"
+    else
+	exec /bin/sh -x $target "$@"
+    fi
+}
+
+# Lets get ready to rumble!
+main "$@"


Property changes on: branches/UIServer/core-uiserver/build.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: branches/UIServer/core-uiserver/build.xml
===================================================================
--- branches/UIServer/core-uiserver/build.xml	                        (rev 0)
+++ branches/UIServer/core-uiserver/build.xml	2007-11-18 00:52:27 UTC (rev 9004)
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software 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          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE project [
+   <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
+   <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
+   <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
+   <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
+   <!ENTITY defaults   SYSTEM "../tools/etc/buildfragments/defaults.ent">
+   <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
+   ]>
+
+<!-- $Id: build.xml 6929 2007-04-05 21:05:42Z julien at jboss.com $ -->
+
+<!--+======================================================================+-->
+<!--| JBoss Portal (The OpenSource Portal) Build File                      |-->
+<!--|                                                                      |-->
+<!--| Distributable under LGPL license.                                    |-->
+<!--| See terms of license at http://www.gnu.org.                          |-->
+<!--|                                                                      |-->
+<!--| This file has been designed to work with the 'tools' module and      |-->
+<!--| Buildmagic extentions.                                               |-->
+<!--+======================================================================+-->
+
+<project default="main" name="JBoss Portal">
+
+   <!--+====================================================================+-->
+   <!--| Setup                                                              |-->
+   <!--|                                                                    |-->
+   <!--| Include the common build elements.                                 |-->
+   <!--|                                                                    |-->
+   <!--| This defines several different targets, properties and paths.      |-->
+   <!--| It also sets up the basic extention tasks amoung other things.     |-->
+   <!--+====================================================================+-->
+
+   &buildmagic;
+   &modules;
+   &defaults;
+   &tools;
+   &targets;
+
+   <!-- ================================================================== -->
+   <!-- Initialization                                                     -->
+   <!-- ================================================================== -->
+
+   <!--
+      | Initialize the build system.  Must depend on '_buildmagic:init'.
+      | Other targets should depend on 'init' or things will mysteriously fail.
+    -->
+
+   <target name="init" unless="init.disable" depends="_buildmagic:init">
+   </target>
+
+   <!--+====================================================================+-->
+   <!--| Configuration                                                      |-->
+   <!--|                                                                    |-->
+   <!--| This target is invoked by the Buildmagic initialization logic      |-->
+   <!--| and should contain module specific configuration elements.         |-->
+   <!--+====================================================================+-->
+
+   <target name="configure" unless="configure.disable">
+
+      <!-- Configure some properties -->
+      <property name="jboss-junit-configuration" value=""/>
+      <property name="junit.formatter.usefile" value="true"/>
+
+      <!-- Configure thirdparty libraries -->
+      &libraries;
+      <echo message="${xdoclet.xdoclet.lib}"/>
+      <echo message="${sun.servlet.lib}"/>
+      <path id="library.classpath">
+         <path refid="dom4j.dom4j.classpath"/>
+         <path refid="oswego.concurrent.classpath"/>
+         <path refid="jbossas/core.libs.classpath"/>
+         <path refid="apache.ant.classpath"/>
+         <path refid="apache.collections.classpath"/>
+         <path refid="apache.log4j.classpath"/>
+         <path refid="apache.httpclient.classpath"/>
+         <path refid="apache.logging.classpath"/>
+         <path refid="apache.codec.classpath"/>
+         <path refid="junit.junit.classpath"/>
+         <path refid="jboss.test.classpath"/>
+         <path refid="sun.servlet.classpath"/>
+         <path refid="jboss/backport.concurrent.classpath"/>
+         <pathelement location="jboss-bean-deployer.jar"/>
+         <pathelement location="jboss-container.jar"/>
+         <pathelement location="jboss-dependency.jar"/>
+         <pathelement location="jboss-microcontainer.jar"/>
+      </path>
+
+      <!-- Configure modules -->
+      <call target="configure-modules"/>
+      <path id="dependentmodule.classpath">
+         <path refid="jboss.portal-common.classpath"/>
+         <path refid="jboss.portal-web.classpath"/>
+         <path refid="jboss.portal-jems.classpath"/>
+         <path refid="jboss.portal-test.classpath"/>
+      </path>
+
+      <!--+=======================================+-->
+      <!--| Override any default properties here. |-->
+      <!--+=======================================+-->
+
+      <!-- Configure defaults & build tools -->
+      <call target="configure-defaults"/>
+      <call target="configure-tools"/>
+
+      <!--+=======================================+-->
+      <!--| Define module specific elements here. |-->
+      <!--+=======================================+-->
+      <property name="javadoc.private" value="true"/>
+      <property name="javadoc.protected" value="false"/>
+
+   </target>
+
+   <!--+====================================================================+-->
+   <!--| Compile                                                            |-->
+   <!--|                                                                    |-->
+   <!--| This target should depend on other compile-* targets for each      |-->
+   <!--| different type of compile that needs to be performed, short of     |-->
+   <!--| documentation compiles.                                            |-->
+   <!--+====================================================================+-->
+
+   <target name="compile"
+           description="Compile all source files."
+           depends="_default:compile-classes,
+               _default:compile-etc,
+               _default:compile-resources">
+      <!-- Add module specific elements here. -->
+   </target>
+
+   <!--+====================================================================+-->
+   <!--| Generate Output                                                    |-->
+   <!--|                                                                    |-->
+   <!--| Generates the target output for this module. Target output is      |-->
+   <!--| the output which is ment to be released or used by external        |-->
+   <!--| modules.                                                           |-->
+   <!--+====================================================================+-->
+
+   <target name="output"
+           description="Generate all target output."
+           depends="compile">
+
+	      <!-- -->
+      <mkdir dir="${build.lib}"/>
+
+      <!-- -->
+      <jar jarfile="${build.lib}/portal-server-lib.jar">
+	         <fileset dir="${build.classes}" excludes="org/jboss/portal/test/**"/>
+	      </jar>    
+
+	      <copy todir="${build.resources}/portal-server-sar">
+	         <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
+            <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
+	         <fileset dir="${build.lib}/" includes="portal-server-lib.jar"/>
+	      </copy>
+	      <jar jarfile="${build.lib}/portal-server.sar">
+	         <fileset dir="${build.resources}/portal-server-sar"/>
+	      </jar>   
+	      <jar jarfile="${build.lib}/portal-server-test-lib.jar">
+	         <fileset dir="${build.classes}" includes="org/jboss/portal/test/server/**"/>
+	       </jar>
+         <jar jarfile="${build.lib}/portal-server-test-framework-lib.jar">
+            <fileset dir="${build.classes}" includes="org/jboss/portal/test/framework/**"/>
+         </jar>
+	   </target>
+
+   <!-- generates artifacts used for tests, requires output to be previously run -->
+   <target name="package-tests" depends="init">
+
+	      <jar jarfile="${build.lib}/test-agent.war">
+	         <fileset dir="${build.resources}/test-agent-war"/>
+	      </jar>
+
+	      <jar jarfile="${build.lib}/test-parameters.sar">
+            <fileset dir="${junit.junit.lib}" includes="junit.jar"/>
+	         <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/>
+	         <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
+            <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
+            <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/>
+	         <fileset dir="${build.lib}" includes="test-agent.war"/>
+	         <fileset dir="${build.lib}" includes="portal-server-lib.jar"/>
+	         <fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/>
+	         <fileset dir="${build.lib}" includes="portal-server-test-framework-lib.jar"/>
+	         <fileset dir="${build.resources}/test/test-parameters-sar"/>
+	      </jar>
+
+	      <jar jarfile="${build.lib}/test-servlet-rootpathmapping.war">
+	         <fileset dir="${build.resources}/test/test-servlet-rootpathmapping-war"/>
+	      </jar>
+	      <jar jarfile="${build.lib}/test-servlet-pathmapping.war">
+	         <fileset dir="${build.resources}/test/test-servlet-pathmapping-war"/>
+	      </jar>
+	      <jar jarfile="${build.lib}/test-servlet-defaultservletmapping.war">
+	         <fileset dir="${build.resources}/test/test-servlet-defaultservletmapping-war"/>
+	      </jar>
+	      <jar jarfile="${build.lib}/test-servlet.sar">
+            <fileset dir="${junit.junit.lib}" includes="junit.jar"/>
+            <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/>
+	         <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
+            <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/>
+            <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
+	         <fileset dir="${build.lib}" includes="test-agent.war"/>
+	         <fileset dir="${build.lib}" includes="portal-server-lib.jar"/>
+	         <fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/>
+            <fileset dir="${build.lib}" includes="portal-server-test-framework-lib.jar"/>
+	         <fileset dir="${build.resources}/test/test-servlet-sar"/>
+	         <fileset dir="${build.lib}" includes="test-servlet-rootpathmapping.war"/>
+	         <fileset dir="${build.lib}" includes="test-servlet-pathmapping.war"/>
+	         <fileset dir="${build.lib}" includes="test-servlet-defaultservletmapping.war"/>
+	      </jar>  
+
+	      <jar jarfile="${build.lib}/test-charset.sar">
+            <fileset dir="${junit.junit.lib}" includes="junit.jar"/>
+            <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/>
+	         <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
+            <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/>
+            <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
+	         <fileset dir="${build.lib}" includes="test-agent.war"/>
+	         <fileset dir="${build.lib}" includes="portal-server-lib.jar"/>
+	         <fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/>
+            <fileset dir="${build.lib}" includes="portal-server-test-framework-lib.jar"/>
+	         <fileset dir="${build.resources}/test/test-charset-sar"/>
+	      </jar>      
+
+      <jar jarfile="${build.lib}/test-response.sar">
+         <fileset dir="${junit.junit.lib}" includes="junit.jar"/>
+         <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/>
+         <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
+         <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
+         <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/>
+         <fileset dir="${build.lib}" includes="test-agent.war"/>
+         <fileset dir="${build.lib}" includes="portal-server-lib.jar"/>
+         <fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/>
+         <fileset dir="${build.lib}" includes="portal-server-test-framework-lib.jar"/>
+         <fileset dir="${build.resources}/test/test-response-sar"/>
+      </jar>
+	   </target>
+
+   <!-- ================================================================== -->
+   <!-- Cleaning                                                           -->
+   <!-- ================================================================== -->
+
+   <!-- Clean up all build output -->
+   <target name="clean" depends="_default:clean">
+      <!-- Add module specific elements here. -->
+   </target>
+
+   <!--+====================================================================+-->
+   <!--| Documents                                                          |-->
+   <!--|                                                                    |-->
+   <!--| Generate all documentation for this module.                        |-->
+   <!--+====================================================================+-->
+
+   <target name="docs" depends="_default:docs">
+      <!-- Add module specific elements here. -->
+   </target>
+
+   <!-- ================================================================== -->
+   <!-- Misc.                                                              -->
+   <!-- ================================================================== -->
+
+   <target name="main" depends="most"/>
+   <target name="all" depends="_default:all"/>
+   <target name="most" depends="_default:most"/>
+   <target name="help" depends="_default:help"/>
+
+   <!-- ================================================================== -->
+   <!-- Deployment                                                         -->
+   <!-- ================================================================== -->
+
+   <target name="deploy"
+           description="Deploy."
+           depends="output">
+      <require file="${jboss.home}/server/${portal.deploy.dir}"/>
+      <copy file="${build.lib}/portal-server.sar" todir="${jboss.home}/server/${portal.deploy.dir}"/>
+   </target>
+
+   <target name="undeploy"
+           description="Undeploy."
+           depends="init">
+      <require file="${jboss.home}/server/${portal.deploy.dir}"/>
+      <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-server.sar"/>
+   </target>
+
+   <target name="tests" depends="init">
+      <execute-tests>
+         <x-sysproperty>
+            <sysproperty key="test.root" value="${build.lib}"/>
+            <sysproperty key="test.uri" value="/test/redirect/"/>
+<!--
+            <jvmarg value="-Xdebug"/>
+            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/>
+-->
+         </x-sysproperty>
+         <x-test>
+            <!-- Server side tests -->
+            <test todir="${test.reports}" name="org.jboss.portal.test.server.CharsetTestCase"/>
+            <test todir="${test.reports}" name="org.jboss.portal.test.server.ParametersTestCase"/>
+            <test todir="${test.reports}" name="org.jboss.portal.test.server.ServletTestCase"/>
+            <test todir="${test.reports}" name="org.jboss.portal.test.server.ResponseTestCase"/>
+            <test todir="${test.reports}" name="org.jboss.portal.test.server.request.URLContextTestCase"/>
+         </x-test>
+         <x-classpath>
+            <path refid="jboss.serialization.classpath"/>
+            <path refid="jboss.remoting.classpath"/>
+            <path refid="jboss.microcontainer.classpath"/>
+            <path refid="jboss.jbossxb.classpath"/>
+            <path refid="apache.xerces.classpath"/>
+            <pathelement location="${build.classes}"/>
+            <pathelement location="${build.resources}"/>
+            <path refid="library.classpath"/>
+            <path refid="dependentmodule.classpath"/>
+         </x-classpath>
+      </execute-tests>
+   </target>
+</project>


Property changes on: branches/UIServer/core-uiserver/build.xml
___________________________________________________________________
Name: svn:executable
   + *




More information about the portal-commits mailing list