You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by se...@apache.org on 2008/03/29 00:39:50 UTC
svn commit: r642435 [3/5] - in /jakarta/cactus/trunk: ./ build-tools/
build-tools/src/main/resources/build-tools/ cactus-maven-skin/
cactus-maven-skin/src/main/resources/css/ cactus-site/
cactus-site/src/changes/ cactus-site/src/site/ cactus-site/src/s...
Propchange: jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/server/AbstractServletConfigWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/server/AbstractServletContextWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/server/FilterConfigWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/server/FilterTestRedirector.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/server/JspTestRedirector.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/server/RequestDispatcherWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/server/ServletConfigWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/server/ServletContextWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/server/ServletTestRedirector.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/server/runner/ServletTestRunner.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-13-14/src/test/java/org/apache/cactus/TestAll.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-13-14/src/test/java/org/apache/cactus/extension/jetty/TestJettyTestSetup.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-uberjars/javaEE-12-uberjar/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-uberjars/javaEE-12-uberjar/src/assemble/main.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-uberjars/javaEE-13-uberjar/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-uberjars/javaEE-13-uberjar/src/assemble/main.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-uberjars/javaEE-14-uberjar/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-uberjars/javaEE-14-uberjar/src/assemble/main.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-uberjars/javaEE-15-uberjar/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-uberjars/javaEE-15-uberjar/src/assemble/main.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-uberjars/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-wrappers/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-12/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-12/src/main/java/org/apache/cactus/server/HttpServletRequestWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-12/src/main/java/org/apache/cactus/server/PageContextWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-12/src/main/java/org/apache/cactus/server/ServletConfigWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-12/src/main/java/org/apache/cactus/server/ServletContextWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-12/src/test/java/org/apache/cactus/TestAll.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-13/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-13/src/main/java/org/apache/cactus/server/HttpServletRequestWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-13/src/main/java/org/apache/cactus/server/PageContextWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-14/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-14/src/assemble/main.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-14/src/main/java/org/apache/cactus/server/HttpServletRequestWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-14/src/main/java/org/apache/cactus/server/PageContextWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-15/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/framework-wrappers/wrapper-javaEE-15/src/assemble/main.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/logging.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/maven.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/framework/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/j2ee12/tomcat3x/modules.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/j2ee12/tomcat3x/server.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/j2ee12/tomcat3x/tomcat-users.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/j2ee12/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/j2ee13/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/log_client.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/log_server.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/orion1x/ear/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/orion1x/ear/default-web-site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/orion1x/ear/server.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/orion1x/share/global-web-application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/orion1x/share/principals.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/orion1x/share/rmi.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/orion1x/share/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/orion1x/war/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/orion1x/war/default-web-site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/orion1x/war/server.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/orion2x/ear/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/orion2x/ear/default-web-site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/orion2x/ear/server.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/orion2x/share/global-web-application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/orion2x/share/principals.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/orion2x/share/rmi.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/orion2x/share/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/orion2x/war/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/orion2x/war/default-web-site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/orion2x/war/server.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/resin3x/app-default.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/tomcat4x/server.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/tomcat4x/tomcat-users.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/tomcat5x/server.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/tomcat5x/tomcat-users.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/weblogic6x/config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/weblogic6x/fileRealm.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/weblogic6x/weblogic.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/weblogic7x/config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/confs/share/weblogic7x/weblogic.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CactifyEarTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CactifyWarTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CactusTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CactusTestTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CactusWar.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/CargoElement.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/ContainerSet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/HOWTO.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/RunServerTestsTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/WebXmlMergeTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/container/ContainerRunner.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/container/ContainerWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/container/GenericContainer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/AbstractDeployableFile.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/DeployableFile.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/EarDeployableFile.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/EarParser.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/WarDeployableFile.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/deployment/WarParser.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/util/HttpProbe.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/java/org/apache/cactus/integration/ant/util/PropertySet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/default.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/orion1x/ear/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/orion1x/ear/default-web-site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/orion1x/ear/server.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/orion1x/share/global-web-application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/orion1x/share/principals.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/orion1x/share/rmi.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/orion1x/share/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/orion1x/war/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/orion1x/war/default-web-site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/orion1x/war/server.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/orion2x/ear/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/orion2x/ear/default-web-site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/orion2x/ear/server.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/orion2x/share/global-web-application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/orion2x/share/principals.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/orion2x/share/rmi.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/orion2x/share/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/orion2x/war/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/orion2x/war/default-web-site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/orion2x/war/server.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/resin3x/app-default.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/tomcat4x/server.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/tomcat4x/tomcat-users.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/tomcat5x/server.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/tomcat5x/tomcat-users.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/weblogic6x/config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/weblogic6x/fileRealm.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/weblogic6x/weblogic.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/weblogic7x/config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/main/resources/org/apache/cactus/integration/ant/container/resources/weblogic7x/weblogic.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/container/resin/test-resin3x.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-cactifyear.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-cactifywar.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-cactus.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-cactustest.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-containerset.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/test-input/org/apache/cactus/integration/ant/test-runservertests.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/test/java/org/apache/cactus/integration/ant/AntTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/test/java/org/apache/cactus/integration/ant/EclipseTestAll.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/test/java/org/apache/cactus/integration/ant/TestAll.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/test/java/org/apache/cactus/integration/ant/TestCactifyEarTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/test/java/org/apache/cactus/integration/ant/TestCactifyWarTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/test/java/org/apache/cactus/integration/ant/TestCactusTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/test/java/org/apache/cactus/integration/ant/TestCactusTestTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/test/java/org/apache/cactus/integration/ant/TestRunServerTestsTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/test/java/org/apache/cactus/integration/ant/deployment/TestAll.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/test/java/org/apache/cactus/integration/ant/deployment/TestEarParser.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/test/java/org/apache/cactus/integration/ant/deployment/TestJarArchive.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/test/java/org/apache/cactus/integration/ant/deployment/application/TestApplicationXml.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/test/java/org/apache/cactus/integration/ant/deployment/application/TestApplicationXmlVersion.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/test/java/org/apache/cactus/integration/ant/deployment/webapp/TestWarArchive.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/test/java/org/apache/cactus/integration/ant/deployment/webapp/TestWebXml.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/test/java/org/apache/cactus/integration/ant/deployment/webapp/TestWebXmlMerger.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/ant/src/test/java/org/apache/cactus/integration/ant/deployment/webapp/TestWebXmlVersion.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/eclipse/assembly-conf.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.feature/feature.properties
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.feature/feature.properties?rev=642435&r1=642434&r2=642435&view=diff
==============================================================================
--- jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.feature/feature.properties (original)
+++ jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.feature/feature.properties Fri Mar 28 16:39:13 2008
@@ -1,21 +1,21 @@
-licenseURL=http://www.apache.org/licenses/LICENSE-2.0
-
-license=\
-<!--\n\
- Licensed to the Apache Software Foundation (ASF) under one\n\
- or more contributor license agreements. See the NOTICE file\n\
- distributed with this work for additional information\n\
- regarding copyright ownership. The ASF licenses this file\n\
- to you under the Apache License, Version 2.0 (the\n\
- "License"); you may not use this file except in compliance\n\
- with the License. You may obtain a copy of the License at\n\
- \n\
- http://www.apache.org/licenses/LICENSE-2.0\n\
- \n\
- Unless required by applicable law or agreed to in writing,\n\
- software distributed under the License is distributed on an\n\
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n\
- KIND, either express or implied. See the License for the\n\
- specific language governing permissions and limitations\n\
- under the License. \n\
--->\n\
+licenseURL=http://www.apache.org/licenses/LICENSE-2.0
+
+license=\
+<!--\n\
+ Licensed to the Apache Software Foundation (ASF) under one\n\
+ or more contributor license agreements. See the NOTICE file\n\
+ distributed with this work for additional information\n\
+ regarding copyright ownership. The ASF licenses this file\n\
+ to you under the Apache License, Version 2.0 (the\n\
+ "License"); you may not use this file except in compliance\n\
+ with the License. You may obtain a copy of the License at\n\
+ \n\
+ http://www.apache.org/licenses/LICENSE-2.0\n\
+ \n\
+ Unless required by applicable law or agreed to in writing,\n\
+ software distributed under the License is distributed on an\n\
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n\
+ KIND, either express or implied. See the License for the\n\
+ specific language governing permissions and limitations\n\
+ under the License. \n\
+-->\n\
Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.feature/feature.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.feature/feature.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/assemble/main-bin.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/assemble/main-bin.xml?rev=642435&r1=642434&r2=642435&view=diff
==============================================================================
--- jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/assemble/main-bin.xml (original)
+++ jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/assemble/main-bin.xml Fri Mar 28 16:39:13 2008
@@ -1,86 +1,86 @@
-<assembly>
- <id>bin</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>true</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>org.apache.cactus:org.apache.cactus.eclipse.runner:jar</include>
- </includes>
- <unpack>false</unpack>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>org.mortbay.jetty:org.mortbay.jetty:jar</include>
- </includes>
- <unpack>false</unpack>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib/common</outputDirectory>
- <includes>
- <include>aspectj:aspectjrt:jar</include>
- <include>org.apache.cactus:cactus.core.framework.uberjar.javaEE.14:jar</include>
- <include>commons-logging:commons-logging:jar</include>
- <include>httpunit:httpunit:jar</include>
- <include>junit:junit:jar</include>
- <include>log4j:log4j:jar</include>
- <include>jsp</include>
- <include>tomcat:jasper-compiler:jar</include>
- <include>tomcat:jasper-runtime:jar</include>
- <include>javax.servlet:jsp-api:jar</include>
- </includes>
- <unpack>false</unpack>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib/client</outputDirectory>
- <includes>
- <include>org.apache.cactus:cactus.integration.ant:jar</include>
- <include>commons-httpclient:commons-httpclient:jar</include>
- <include>javax.servlet:servlet-api:jar</include>
- <include>nekohtml:nekohtml:jar</include>
- </includes>
- <unpack>false</unpack>
- </dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>*-src.zip</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/conf</directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>jspRedirector.jsp</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>src/conf</directory>
- <outputDirectory>lib/conf</outputDirectory>
- <includes>
- <include>jspRedirector.jsp</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>icons</directory>
- <outputDirectory>icons</outputDirectory>
- <includes>
- <include>*.*</include>
- </includes>
- </fileSet>
- </fileSets>
-</assembly>
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org.apache.cactus:org.apache.cactus.eclipse.runner:jar</include>
+ </includes>
+ <unpack>false</unpack>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>org.mortbay.jetty:org.mortbay.jetty:jar</include>
+ </includes>
+ <unpack>false</unpack>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib/common</outputDirectory>
+ <includes>
+ <include>aspectj:aspectjrt:jar</include>
+ <include>org.apache.cactus:cactus.core.framework.uberjar.javaEE.14:jar</include>
+ <include>commons-logging:commons-logging:jar</include>
+ <include>httpunit:httpunit:jar</include>
+ <include>junit:junit:jar</include>
+ <include>log4j:log4j:jar</include>
+ <include>jsp</include>
+ <include>tomcat:jasper-compiler:jar</include>
+ <include>tomcat:jasper-runtime:jar</include>
+ <include>javax.servlet:jsp-api:jar</include>
+ </includes>
+ <unpack>false</unpack>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib/client</outputDirectory>
+ <includes>
+ <include>org.apache.cactus:cactus.integration.ant:jar</include>
+ <include>commons-httpclient:commons-httpclient:jar</include>
+ <include>javax.servlet:servlet-api:jar</include>
+ <include>nekohtml:nekohtml:jar</include>
+ </includes>
+ <unpack>false</unpack>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*-src.zip</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/conf</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>jspRedirector.jsp</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>src/conf</directory>
+ <outputDirectory>lib/conf</outputDirectory>
+ <includes>
+ <include>jspRedirector.jsp</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>icons</directory>
+ <outputDirectory>icons</outputDirectory>
+ <includes>
+ <include>*.*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/assemble/main-bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/assemble/main-src.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/assemble/main-src.xml?rev=642435&r1=642434&r2=642435&view=diff
==============================================================================
--- jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/assemble/main-src.xml (original)
+++ jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/assemble/main-src.xml Fri Mar 28 16:39:13 2008
@@ -1,14 +1,14 @@
-<assembly>
- <id>src</id>
- <includeBaseDirectory>false</includeBaseDirectory>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>src/main/java/</directory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
+<assembly>
+ <id>src</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/java/</directory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/assemble/main-src.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/conf/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/conf/plugin.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/common/JarFilenameFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/common/LibraryHelper.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/common/LibraryHelper.java?rev=642435&r1=642434&r2=642435&view=diff
==============================================================================
--- jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/common/LibraryHelper.java (original)
+++ jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/common/LibraryHelper.java Fri Mar 28 16:39:13 2008
@@ -1,183 +1,183 @@
-/*
- * ========================================================================
- *
- * Copyright 2001-2003 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * ========================================================================
- */
-package org.apache.cactus.eclipse.runner.common;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.apache.cactus.eclipse.runner.ui.CactusPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-
-/**
- * Helper class for library access.
- *
- * @version $Id: LibraryHelper.java 238816 2004-02-29 16:36:46Z vmassol $
- */
-public class LibraryHelper
-{
- /**
- * Returns an array of jar paths contained
- * in the given directory.
- * @param theDirectory the directory to list jars from
- * @return an array of jar paths
- */
- private static IPath[] getJarPathArray(File theDirectory)
- {
- File[] files = theDirectory.listFiles(new JarFilenameFilter());
- IPath[] result = new IPath[files.length];
- for (int i = 0; i < files.length; i++)
- {
- result[i] = new Path(files[i].getAbsolutePath());
- }
- return result;
- }
-
- /**
- * @return an IPath array of the jar files in client lib directory
- */
- private static IPath[] getClientJarPathArray()
- {
- File clientLibDir = getClientLibPath().toFile();
- return getJarPathArray(clientLibDir);
- }
-
- /**
- * @return an IPath array of the jar files in client lib directory
- */
- private static IPath[] getCommonJarPathArray()
- {
- File commmonLibDir = getCommonLibPath().toFile();
- return getJarPathArray(commmonLibDir);
- }
-
- /**
- * @return an array of IClasspathEntry contained in the client dir
- */
- public static IClasspathEntry[] getClientEntries()
- {
- IPath[] clientJars = getClientJarPathArray();
- IClasspathEntry[] result = new IClasspathEntry[clientJars.length];
- for (int i = 0; i < clientJars.length; i++)
- {
- result[i] = getIClasspathEntry(clientJars[i]);
- }
- return result;
- }
-
- /**
- * @return an array of IClasspathEntry contained in the common dir
- */
- public static IClasspathEntry[] getCommonEntries()
- {
- IPath[] commonJars = getCommonJarPathArray();
- IClasspathEntry[] result = new IClasspathEntry[commonJars.length];
- for (int i = 0; i < commonJars.length; i++)
- {
- result[i] = getIClasspathEntry(commonJars[i]);
- }
- return result;
- }
-
- /**
- * @return an array of IClasspathEntry contained in the common dir
- */
- public static IClasspathEntry[] getClientSideEntries()
- {
- IClasspathEntry[] clientEntries = getClientEntries();
- IClasspathEntry[] commonEntries = getCommonEntries();
- return concatenateEntries(clientEntries, commonEntries);
- }
-
- /**
- * Concatenate two IClasspathEntry arrays.
- *
- * @param theArray1 the first array
- * @param theArray2 the second array
- * @return an IClasspathEntry array containing the first array
- * followed by the second one
- */
- public static IClasspathEntry[] concatenateEntries(
- IClasspathEntry[] theArray1, IClasspathEntry[] theArray2)
- {
- IClasspathEntry[] newArray =
- new IClasspathEntry[theArray1.length + theArray2.length];
- System.arraycopy(theArray1, 0, newArray, 0, theArray1.length);
- System.arraycopy(
- theArray2,
- 0,
- newArray,
- theArray1.length,
- theArray2.length);
- return newArray;
- }
-
- /**
- * @return the path to the library directory
- */
- public static IPath getLibPath()
- {
- CactusPlugin thePlugin = CactusPlugin.getDefault();
-
- try {
- return new Path(Platform.asLocalURL(thePlugin.getBundle().getEntry("/" +CactusPlugin.CACTUS_LIBRARY_PATH)).getPath());
- } catch(IOException ex) {
- CactusPlugin.log(ex); // throwing an exception would be preferable
- }
- return new Path(CactusPlugin.CACTUS_LIBRARY_PATH);
- }
-
- /**
- * @return the path to the client library directory
- */
- private static IPath getClientLibPath()
- {
- return getLibPath().append(CactusPlugin.CACTUS_CLIENT_LIBRARY_PATH);
- }
-
- /**
- * @return the path to the common library directory
- */
- private static IPath getCommonLibPath()
- {
- return getLibPath().append(CactusPlugin.CACTUS_COMMON_LIBRARY_PATH);
- }
-
- /**
- * @param thePath path to convert to an IClasspathEntry
- * @return the IClasspathEntry built from the given path
- */
- public static IClasspathEntry getIClasspathEntry(IPath thePath)
- {
- return JavaCore.newLibraryEntry(thePath, null, null);
- }
-
- /**
- * @param thePath path to convert to an IClasspathEntry
- * @return the IClasspathEntry built from the given path
- */
- public static IClasspathEntry getIClasspathEntry(String thePath)
- {
- return getIClasspathEntry(new Path(thePath));
- }
-}
+/*
+ * ========================================================================
+ *
+ * Copyright 2001-2003 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ========================================================================
+ */
+package org.apache.cactus.eclipse.runner.common;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.cactus.eclipse.runner.ui.CactusPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.JavaCore;
+
+/**
+ * Helper class for library access.
+ *
+ * @version $Id: LibraryHelper.java 238816 2004-02-29 16:36:46Z vmassol $
+ */
+public class LibraryHelper
+{
+ /**
+ * Returns an array of jar paths contained
+ * in the given directory.
+ * @param theDirectory the directory to list jars from
+ * @return an array of jar paths
+ */
+ private static IPath[] getJarPathArray(File theDirectory)
+ {
+ File[] files = theDirectory.listFiles(new JarFilenameFilter());
+ IPath[] result = new IPath[files.length];
+ for (int i = 0; i < files.length; i++)
+ {
+ result[i] = new Path(files[i].getAbsolutePath());
+ }
+ return result;
+ }
+
+ /**
+ * @return an IPath array of the jar files in client lib directory
+ */
+ private static IPath[] getClientJarPathArray()
+ {
+ File clientLibDir = getClientLibPath().toFile();
+ return getJarPathArray(clientLibDir);
+ }
+
+ /**
+ * @return an IPath array of the jar files in client lib directory
+ */
+ private static IPath[] getCommonJarPathArray()
+ {
+ File commmonLibDir = getCommonLibPath().toFile();
+ return getJarPathArray(commmonLibDir);
+ }
+
+ /**
+ * @return an array of IClasspathEntry contained in the client dir
+ */
+ public static IClasspathEntry[] getClientEntries()
+ {
+ IPath[] clientJars = getClientJarPathArray();
+ IClasspathEntry[] result = new IClasspathEntry[clientJars.length];
+ for (int i = 0; i < clientJars.length; i++)
+ {
+ result[i] = getIClasspathEntry(clientJars[i]);
+ }
+ return result;
+ }
+
+ /**
+ * @return an array of IClasspathEntry contained in the common dir
+ */
+ public static IClasspathEntry[] getCommonEntries()
+ {
+ IPath[] commonJars = getCommonJarPathArray();
+ IClasspathEntry[] result = new IClasspathEntry[commonJars.length];
+ for (int i = 0; i < commonJars.length; i++)
+ {
+ result[i] = getIClasspathEntry(commonJars[i]);
+ }
+ return result;
+ }
+
+ /**
+ * @return an array of IClasspathEntry contained in the common dir
+ */
+ public static IClasspathEntry[] getClientSideEntries()
+ {
+ IClasspathEntry[] clientEntries = getClientEntries();
+ IClasspathEntry[] commonEntries = getCommonEntries();
+ return concatenateEntries(clientEntries, commonEntries);
+ }
+
+ /**
+ * Concatenate two IClasspathEntry arrays.
+ *
+ * @param theArray1 the first array
+ * @param theArray2 the second array
+ * @return an IClasspathEntry array containing the first array
+ * followed by the second one
+ */
+ public static IClasspathEntry[] concatenateEntries(
+ IClasspathEntry[] theArray1, IClasspathEntry[] theArray2)
+ {
+ IClasspathEntry[] newArray =
+ new IClasspathEntry[theArray1.length + theArray2.length];
+ System.arraycopy(theArray1, 0, newArray, 0, theArray1.length);
+ System.arraycopy(
+ theArray2,
+ 0,
+ newArray,
+ theArray1.length,
+ theArray2.length);
+ return newArray;
+ }
+
+ /**
+ * @return the path to the library directory
+ */
+ public static IPath getLibPath()
+ {
+ CactusPlugin thePlugin = CactusPlugin.getDefault();
+
+ try {
+ return new Path(Platform.asLocalURL(thePlugin.getBundle().getEntry("/" +CactusPlugin.CACTUS_LIBRARY_PATH)).getPath());
+ } catch(IOException ex) {
+ CactusPlugin.log(ex); // throwing an exception would be preferable
+ }
+ return new Path(CactusPlugin.CACTUS_LIBRARY_PATH);
+ }
+
+ /**
+ * @return the path to the client library directory
+ */
+ private static IPath getClientLibPath()
+ {
+ return getLibPath().append(CactusPlugin.CACTUS_CLIENT_LIBRARY_PATH);
+ }
+
+ /**
+ * @return the path to the common library directory
+ */
+ private static IPath getCommonLibPath()
+ {
+ return getLibPath().append(CactusPlugin.CACTUS_COMMON_LIBRARY_PATH);
+ }
+
+ /**
+ * @param thePath path to convert to an IClasspathEntry
+ * @return the IClasspathEntry built from the given path
+ */
+ public static IClasspathEntry getIClasspathEntry(IPath thePath)
+ {
+ return JavaCore.newLibraryEntry(thePath, null, null);
+ }
+
+ /**
+ * @param thePath path to convert to an IClasspathEntry
+ * @return the IClasspathEntry built from the given path
+ */
+ public static IClasspathEntry getIClasspathEntry(String thePath)
+ {
+ return getIClasspathEntry(new Path(thePath));
+ }
+}
Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/common/LibraryHelper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/containers/ContainerInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/containers/Credential.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/containers/IContainerManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/containers/IContainerProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/containers/ant/AntContainerManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/containers/ant/AntContainerProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/containers/ant/EclipseRunTests.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/containers/jetty/JettyContainerManager.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/containers/jetty/JettyContainerManager.java?rev=642435&r1=642434&r2=642435&view=diff
==============================================================================
--- jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/containers/jetty/JettyContainerManager.java (original)
+++ jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/containers/jetty/JettyContainerManager.java Fri Mar 28 16:39:13 2008
@@ -1,177 +1,177 @@
-/*
- * ========================================================================
- *
- * Copyright 2001-2003 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * ========================================================================
- */
-package org.apache.cactus.eclipse.runner.containers.jetty;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-
-import org.apache.cactus.eclipse.runner.containers.IContainerManager;
-import org.apache.cactus.eclipse.runner.ui.CactusPlugin;
-import org.apache.cactus.eclipse.runner.ui.CactusPreferences;
-import org.apache.cactus.eclipse.webapp.internal.WarBuilder;
-import org.apache.cactus.eclipse.webapp.internal.Webapp;
-import org.apache.cactus.eclipse.webapp.internal.ui.WebappPlugin;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Copy;
-import org.apache.tools.ant.types.FileSet;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IJavaProject;
-
-/**
- * Implementation of IContainerManager for the Jetty container.
- *
- * @version $Id: JettyContainerManager.java 238816 2004-02-29 16:36:46Z vmassol $
- */
-public class JettyContainerManager implements IContainerManager
-{
-
- /**
- * The name of the path to the Jetty webapp
- */
- private static final String JETTY_WEBAPP_PATH = "jetty.webapp";
-
- /**
- * The name of the jspRedirector.jsp file
- */
- private static final String JSPREDIRECTOR_PATH =
- new String("lib/confs/jspRedirector.jsp");
-
- /**
- * Directory containg the web application for Jetty
- */
- private File jettyWebappDir =
- new File(
- CactusPreferences.getTempDir()
- + File.separator
- + JETTY_WEBAPP_PATH);
- /**
- * @see IContainerManager#prepare(org.eclipse.jdt.core.IJavaProject)
- */
- public void prepare(IJavaProject theJavaProject)
- {
- try
- {
- cactifyWebapp(theJavaProject);
- }
- catch (CoreException e)
- {
- CactusPlugin.log("Failed"+e.getMessage());
- }
- }
-
- /**
- * @see IContainerManager#tearDown()
- */
- public void tearDown()
- {
- //WarBuilder.delete(jettyWebappDir);
- }
-
- /**
- * @param theJavaProject the project to cactify
- * @throws CoreException if the cactification could not occur
- */
- private void cactifyWebapp(IJavaProject theJavaProject)
- throws CoreException
- {
- WarBuilder.delete(jettyWebappDir);
- jettyWebappDir.mkdir();
- copyCactusWebappResources(jettyWebappDir);
- Webapp webapp = WebappPlugin.getWebapp(theJavaProject);
- webapp.init();
- File webappDir = webapp.getAbsoluteDir();
- if (webappDir != null && webappDir.exists())
- {
- copyContents(webappDir, jettyWebappDir);
- }
- }
-
- /**
- * Copies Cactus webapp resources (jspredirector.jsp) to the given
- * directory
- * @param theDir the directory to copy resources to
- * @throws CoreException if we cannot copy the resources
- */
- private void copyCactusWebappResources(File theDir) throws CoreException
- {
- Project antProject = new Project();
- antProject.init();
- Copy copy = new Copy();
- copy.setProject(antProject);
- copy.setTodir(theDir);
- CactusPlugin thePlugin = CactusPlugin.getDefault();
- URL jspRedirectorURL = null;
- try {
- jspRedirectorURL = Platform.asLocalURL(thePlugin.getBundle().getEntry(JSPREDIRECTOR_PATH));
- } catch (IOException e1) {
- //do nothing the exception is called later.
- }
- if (jspRedirectorURL == null)
- {
- throw CactusPlugin.createCoreException(
- "CactusLaunch.message.prepare.error.plugin.file",
- " : " + JSPREDIRECTOR_PATH,
- null);
- }
- try{
- jspRedirectorURL = Platform.asLocalURL(jspRedirectorURL);
- } catch(IOException e) {
- throw CactusPlugin.createCoreException(
- "CactusLaunch.message.prepare.error.plugin.file",
- " : " + e.getMessage(),
- null);
- }
- //CactusPlugin.log(jspRedirectorURL.getPath());
- File jspRedirector = new File(jspRedirectorURL.getPath());
- FileSet fileSet = new FileSet();
- fileSet.setFile(jspRedirector);
- copy.addFileset(fileSet);
- copy.execute();
- }
-
- /**
- * copies files from a directory to another directory
- * @param theSourceDir directory to copy files from
- * @param theTargetDir directory to copy files to
- */
- private void copyContents(File theSourceDir, File theTargetDir)
- {
- Project antProject = new Project();
- antProject.init();
- Copy copy = new Copy();
- copy.setProject(antProject);
- copy.setTodir(theTargetDir);
- FileSet fileSet = new FileSet();
- fileSet.setDir(theSourceDir);
- copy.addFileset(fileSet);
- copy.execute();
- }
-
- /**
- * @return the path name element of the web application directory
- */
- public static String getJettyWebappPath()
- {
- return JETTY_WEBAPP_PATH;
- }
-}
+/*
+ * ========================================================================
+ *
+ * Copyright 2001-2003 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ========================================================================
+ */
+package org.apache.cactus.eclipse.runner.containers.jetty;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+
+import org.apache.cactus.eclipse.runner.containers.IContainerManager;
+import org.apache.cactus.eclipse.runner.ui.CactusPlugin;
+import org.apache.cactus.eclipse.runner.ui.CactusPreferences;
+import org.apache.cactus.eclipse.webapp.internal.WarBuilder;
+import org.apache.cactus.eclipse.webapp.internal.Webapp;
+import org.apache.cactus.eclipse.webapp.internal.ui.WebappPlugin;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.Copy;
+import org.apache.tools.ant.types.FileSet;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jdt.core.IJavaProject;
+
+/**
+ * Implementation of IContainerManager for the Jetty container.
+ *
+ * @version $Id: JettyContainerManager.java 238816 2004-02-29 16:36:46Z vmassol $
+ */
+public class JettyContainerManager implements IContainerManager
+{
+
+ /**
+ * The name of the path to the Jetty webapp
+ */
+ private static final String JETTY_WEBAPP_PATH = "jetty.webapp";
+
+ /**
+ * The name of the jspRedirector.jsp file
+ */
+ private static final String JSPREDIRECTOR_PATH =
+ new String("lib/confs/jspRedirector.jsp");
+
+ /**
+ * Directory containg the web application for Jetty
+ */
+ private File jettyWebappDir =
+ new File(
+ CactusPreferences.getTempDir()
+ + File.separator
+ + JETTY_WEBAPP_PATH);
+ /**
+ * @see IContainerManager#prepare(org.eclipse.jdt.core.IJavaProject)
+ */
+ public void prepare(IJavaProject theJavaProject)
+ {
+ try
+ {
+ cactifyWebapp(theJavaProject);
+ }
+ catch (CoreException e)
+ {
+ CactusPlugin.log("Failed"+e.getMessage());
+ }
+ }
+
+ /**
+ * @see IContainerManager#tearDown()
+ */
+ public void tearDown()
+ {
+ //WarBuilder.delete(jettyWebappDir);
+ }
+
+ /**
+ * @param theJavaProject the project to cactify
+ * @throws CoreException if the cactification could not occur
+ */
+ private void cactifyWebapp(IJavaProject theJavaProject)
+ throws CoreException
+ {
+ WarBuilder.delete(jettyWebappDir);
+ jettyWebappDir.mkdir();
+ copyCactusWebappResources(jettyWebappDir);
+ Webapp webapp = WebappPlugin.getWebapp(theJavaProject);
+ webapp.init();
+ File webappDir = webapp.getAbsoluteDir();
+ if (webappDir != null && webappDir.exists())
+ {
+ copyContents(webappDir, jettyWebappDir);
+ }
+ }
+
+ /**
+ * Copies Cactus webapp resources (jspredirector.jsp) to the given
+ * directory
+ * @param theDir the directory to copy resources to
+ * @throws CoreException if we cannot copy the resources
+ */
+ private void copyCactusWebappResources(File theDir) throws CoreException
+ {
+ Project antProject = new Project();
+ antProject.init();
+ Copy copy = new Copy();
+ copy.setProject(antProject);
+ copy.setTodir(theDir);
+ CactusPlugin thePlugin = CactusPlugin.getDefault();
+ URL jspRedirectorURL = null;
+ try {
+ jspRedirectorURL = Platform.asLocalURL(thePlugin.getBundle().getEntry(JSPREDIRECTOR_PATH));
+ } catch (IOException e1) {
+ //do nothing the exception is called later.
+ }
+ if (jspRedirectorURL == null)
+ {
+ throw CactusPlugin.createCoreException(
+ "CactusLaunch.message.prepare.error.plugin.file",
+ " : " + JSPREDIRECTOR_PATH,
+ null);
+ }
+ try{
+ jspRedirectorURL = Platform.asLocalURL(jspRedirectorURL);
+ } catch(IOException e) {
+ throw CactusPlugin.createCoreException(
+ "CactusLaunch.message.prepare.error.plugin.file",
+ " : " + e.getMessage(),
+ null);
+ }
+ //CactusPlugin.log(jspRedirectorURL.getPath());
+ File jspRedirector = new File(jspRedirectorURL.getPath());
+ FileSet fileSet = new FileSet();
+ fileSet.setFile(jspRedirector);
+ copy.addFileset(fileSet);
+ copy.execute();
+ }
+
+ /**
+ * copies files from a directory to another directory
+ * @param theSourceDir directory to copy files from
+ * @param theTargetDir directory to copy files to
+ */
+ private void copyContents(File theSourceDir, File theTargetDir)
+ {
+ Project antProject = new Project();
+ antProject.init();
+ Copy copy = new Copy();
+ copy.setProject(antProject);
+ copy.setTodir(theTargetDir);
+ FileSet fileSet = new FileSet();
+ fileSet.setDir(theSourceDir);
+ copy.addFileset(fileSet);
+ copy.execute();
+ }
+
+ /**
+ * @return the path name element of the web application directory
+ */
+ public static String getJettyWebappPath()
+ {
+ return JETTY_WEBAPP_PATH;
+ }
+}
Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/containers/jetty/JettyContainerManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/launcher/CactusLaunchConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/launcher/CactusLaunchShortcut.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/launcher/JettyCactusLaunchConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org