Author: nico
Date: 2010-04-03 16:53:18 +0200 (Sat, 03 Apr 2010)
New Revision: 41756
Added:
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/jetty-env.xml
CMSContainer/branches/b1_7/CMSContainer/server/AppServerConfig/
CMSContainer/branches/b1_7/CMSContainer/server/AppServerConfig/src/
CMSContainer/branches/b1_7/CMSContainer/server/AppServerConfig/src/main/
CMSContainer/branches/b1_7/CMSContainer/server/AppServerConfig/src/main/java/
CMSContainer/branches/b1_7/CMSContainer/server/AppServerConfig/src/main/java/org/
CMSContainer/branches/b1_7/CMSContainer/server/AppServerConfig/src/main/java/org/cmscontainer/
CMSContainer/branches/b1_7/CMSContainer/server/AppServerConfig/src/main/java/org/cmscontainer/tools/
CMSContainer/branches/b1_7/CMSContainer/server/AppServerConfig/src/main/java/org/cmscontainer/tools/appserver/
CMSContainer/branches/b1_7/CMSContainer/server/AppServerConfig/src/main/java/org/cmscontainer/tools/appserver/ConfigGenerator.java
CMSContainer/branches/b1_7/CMSContainer/server/AppServerConfig/src/main/java/org/cmscontainer/tools/appserver/jetty/
CMSContainer/branches/b1_7/CMSContainer/server/AppServerConfig/src/main/java/org/cmscontainer/tools/appserver/jetty/env.xsl
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/jetty-env.xml
CMSContainer/trunk/CMSContainer/server/AppServerConfig/
CMSContainer/trunk/CMSContainer/server/AppServerConfig/src/
CMSContainer/trunk/CMSContainer/server/AppServerConfig/src/main/
CMSContainer/trunk/CMSContainer/server/AppServerConfig/src/main/java/
CMSContainer/trunk/CMSContainer/server/AppServerConfig/src/main/java/org/
CMSContainer/trunk/CMSContainer/server/AppServerConfig/src/main/java/org/cmscontainer/
CMSContainer/trunk/CMSContainer/server/AppServerConfig/src/main/java/org/cmscontainer/tools/
CMSContainer/trunk/CMSContainer/server/AppServerConfig/src/main/java/org/cmscontainer/tools/appserver/
CMSContainer/trunk/CMSContainer/server/AppServerConfig/src/main/java/org/cmscontainer/tools/appserver/ConfigGenerator.java
CMSContainer/trunk/CMSContainer/server/AppServerConfig/src/main/java/org/cmscontainer/tools/appserver/jetty/
CMSContainer/trunk/CMSContainer/server/AppServerConfig/src/main/java/org/cmscontainer/tools/appserver/jetty/env.xsl
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/editors/login.jsp
CMSContainer/branches/b1_7/CMSContainer/project-parent/pom.xml
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/login.jsp
CMSContainer/trunk/CMSContainer/project-parent/pom.xml
Log:
CMSC-1674 Jetty-support for development
Added:
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/jetty-env.xml
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/jetty-env.xml
(rev 0)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/jetty-env.xml
2010-04-03 14:53:18 UTC (rev 41756)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN"
"http://www.eclipse.org/jetty/configure.dtd";>
+<Configure class="org.eclipse.jetty.webapp.WebAppContext">
+ <New class="org.eclipse.jetty.plus.jndi.Resource">
+ <Arg>mail/Session</Arg>
+ <Arg>
+ <New
class="org.eclipse.jetty.jndi.factories.MailSessionReference">
+ <Set name="properties">
+ <New class="java.util.Properties">
+ <Put
name="mail.smtp.host">MISSING.MAILSERVER</Put>
+ </New>
+ </Set>
+ </New>
+ </Arg>
+ </New>
+ <New class="org.eclipse.jetty.plus.jndi.Resource">
+ <Arg>jdbc/cmsc</Arg>
+ <Arg>
+ <New class="com.mchange.v2.c3p0.ComboPooledDataSource">
+ <Set
name="driverClass">com.mysql.jdbc.Driver</Set>
+ <Set
name="jdbcUrl">jdbc:mysql://localhost:3306/cmsc?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useServerPrepStmts=false</Set>
+ <Set name="user">cmsc</Set>
+ <Set name="password">cmsc</Set>
+ </New>
+ </Arg>
+ </New>
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg
type="java.lang.String">mmbase/mmbaseroot/datasource-context</Arg>
+ <Arg type="java.lang.String">java:comp/env</Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg type="java.lang.String">mmbase/mmbaseroot/datasource</Arg>
+ <Arg type="java.lang.String">jdbc/cmsc</Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg type="java.lang.String">mmbase/mmbaseroot/database</Arg>
+ <Arg type="java.lang.String">mysql-cmsc</Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg
type="java.lang.String">mmbase/imaging/ImageConvertClass</Arg>
+ <Arg
type="java.lang.String">org.mmbase.module.builders.ConvertImageMagick</Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg
type="java.lang.String">mmbase/imaging/ImageConvert.ConverterCommand</Arg>
+ <Arg type="java.lang.String">convert</Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg
type="java.lang.String">mmbase/imaging/ImageConvert.ConverterRoot</Arg>
+ <Arg type="java.lang.String"></Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg type="java.lang.String">server/LiveOrStaging</Arg>
+ <Arg type="java.lang.String">single</Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg type="java.lang.String">server/useServerName</Arg>
+ <Arg type="java.lang.String">false</Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg type="java.lang.String">server/production</Arg>
+ <Arg type="java.lang.String">false</Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg type="java.lang.String">server/readonly</Arg>
+ <Arg type="java.lang.String">false</Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+
+ <!-- Put the mmbase datadir also in the target directory -->
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg type="java.lang.String">mmbase/mmbaseroot/datadir</Arg>
+ <Arg type="java.lang.String">target/datadir</Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+</Configure>
\ No newline at end of file
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/editors/login.jsp
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/editors/login.jsp
2010-04-03 14:39:36 UTC (rev 41755)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/editors/login.jsp
2010-04-03 14:53:18 UTC (rev 41756)
@@ -40,7 +40,7 @@
<cmscedit:sideblock title="login.title">
<!-- restricted url: <mm:write referid="referrer" /> -->
- <form method="post" action="<mm:url page='/editors/' />" target="_top">
+ <form method="post" action="<mm:url page='/editors/index.jsp' />"
target="_top">
<input type="hidden" name="command" value="login" />
<input type="hidden" name="cloud" value="mmbase" /><!-- also default
-->
<input type="hidden" name="authenticate" value="name/password" />
Modified: CMSContainer/branches/b1_7/CMSContainer/project-parent/pom.xml
===================================================================
--- CMSContainer/branches/b1_7/CMSContainer/project-parent/pom.xml
2010-04-03 14:39:36 UTC (rev 41755)
+++ CMSContainer/branches/b1_7/CMSContainer/project-parent/pom.xml
2010-04-03 14:53:18 UTC (rev 41756)
@@ -107,4 +107,53 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>jetty</id>
+ <build>
+ <defaultGoal>jetty:run</defaultGoal>
+ <plugins>
+ <plugin>
+
<groupId>org.mortbay.jetty</groupId>
+
<artifactId>jetty-maven-plugin</artifactId>
+ <version>7.0.2.RC0</version>
+ <configuration>
+ <webAppConfig>
+
<defaultsDescriptor>src/jetty/webdefault.xml</defaultsDescriptor>
+ </webAppConfig>
+ <systemProperties>
+ <!-- logs are
configured relatively from catalina.home -->
+ <systemProperty>
+
<name>catalina.home</name>
+
<value>${basedir}/target</value>
+
</systemProperty>
+ </systemProperties>
+
<scanIntervalSeconds>10</scanIntervalSeconds>
+ </configuration>
+ <dependencies>
+ <dependency>
+
<groupId>c3p0</groupId>
+
<artifactId>c3p0</artifactId>
+
<version>0.9.1.2</version>
+
<scope>runtime</scope>
+ </dependency>
+ <dependency>
+
<groupId>mysql</groupId>
+
<artifactId>mysql-connector-java</artifactId>
+
<version>5.1.6</version>
+
<scope>test</scope>
+ </dependency>
+
+ <dependency>
+
<groupId>hsqldb</groupId>
+
<artifactId>hsqldb</artifactId>
+
<version>1.8.0.7</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
Added:
CMSContainer/branches/b1_7/CMSContainer/server/AppServerConfig/src/main/java/org/cmscontainer/tools/appserver/ConfigGenerator.java
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/server/AppServerConfig/src/main/java/org/cmscontainer/tools/appserver/ConfigGenerator.java
(rev 0)
+++
CMSContainer/branches/b1_7/CMSContainer/server/AppServerConfig/src/main/java/org/cmscontainer/tools/appserver/ConfigGenerator.java
2010-04-03 14:53:18 UTC (rev 41756)
@@ -0,0 +1,32 @@
+package org.cmscontainer.tools.appserver;
+
+import java.io.*;
+import java.net.MalformedURLException;
+import java.util.HashMap;
+
+import javax.xml.transform.TransformerException;
+
+import com.finalist.cmsc.util.XsltUtil;
+
+
+public class ConfigGenerator {
+
+ public static void main(String[] args) throws MalformedURLException,
TransformerException, IOException {
+ ConfigGenerator generator = new ConfigGenerator();
+
+ HashMap<String, Object> xslParams = new HashMap<String, Object>();
+
+ File xml = new File(args[0]);
+
+ String jettyEnvXml = generator.transformXml("jetty/env.xsl", xml,
xslParams);
+ System.out.println(jettyEnvXml);
+ }
+
+ protected String transformXml(String xsl, Object xml, HashMap<String,
Object> xslParams)
+ throws TransformerException, IOException, MalformedURLException {
+
+ InputStream xslSrc = this.getClass().getResourceAsStream(xsl);
+ XsltUtil xsltUtil = new XsltUtil(xml, xslSrc, null);
+ return xsltUtil.transformToString(xslParams);
+ }
+}
Added:
CMSContainer/branches/b1_7/CMSContainer/server/AppServerConfig/src/main/java/org/cmscontainer/tools/appserver/jetty/env.xsl
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/server/AppServerConfig/src/main/java/org/cmscontainer/tools/appserver/jetty/env.xsl
(rev 0)
+++
CMSContainer/branches/b1_7/CMSContainer/server/AppServerConfig/src/main/java/org/cmscontainer/tools/appserver/jetty/env.xsl
2010-04-03 14:53:18 UTC (rev 41756)
@@ -0,0 +1,82 @@
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+
+ <xsl:output method="xml" version="1.0" encoding="utf-8" indent="yes"
+ doctype-public="-//Mort Bay Consulting//DTD Configure//EN"
+ doctype-system="http://www.eclipse.org/jetty/configure.dtd"; />
+
+ <xsl:template match="Context">
+ <!--
=============================================================== -->
+ <!-- Configure the Jetty Server
-->
+ <!--
-->
+ <!-- Documentation of this file format can be found at:
-->
+ <!-- http://docs.codehaus.org/display/JETTY/jetty.xml
-->
+ <!--
-->
+ <!--
=============================================================== -->
+ <Configure class="org.eclipse.jetty.webapp.WebAppContext">
+ <xsl:apply-templates select="Resource" />
+ <xsl:apply-templates select="Environment" />
+
+ <!-- Put the mmbase datadir also in the target
directory -->
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg
type="java.lang.String">mmbase/mmbaseroot/datadir</Arg>
+ <Arg
type="java.lang.String">target/datadir</Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+ </Configure>
+ </xsl:template>
+
+ <xsl:template match="resour...@type='javax.mail.Session']">
+ <New class="org.eclipse.jetty.plus.jndi.Resource">
+ <Arg>mail/Session</Arg>
+ <Arg>
+ <New
class="org.eclipse.jetty.jndi.factories.MailSessionReference">
+ <Set name="properties">
+ <New
class="java.util.Properties">
+ <Put
name="mail.smtp.host">
+ <xsl:value-of
select="@mail.smtp.host" />
+ </Put>
+ </New>
+ </Set>
+ </New>
+ </Arg>
+ </New>
+ </xsl:template>
+
+ <xsl:template match="resour...@type='javax.sql.DataSource']">
+ <New class="org.eclipse.jetty.plus.jndi.Resource">
+ <Arg>
+ <xsl:value-of select="@name" />
+ </Arg>
+ <Arg>
+ <New
class="com.mchange.v2.c3p0.ComboPooledDataSource">
+ <Set name="driverClass">
+ <xsl:value-of
select="@driverClassName" />
+ </Set>
+ <Set name="jdbcUrl">
+ <xsl:value-of select="@url" />
+ </Set>
+ <Set name="user">
+ <xsl:value-of
select="@username" />
+ </Set>
+ <Set name="password">
+ <xsl:value-of
select="@password" />
+ </Set>
+ </New>
+ </Arg>
+ </New>
+ </xsl:template>
+
+ <xsl:template match="Environment">
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg type="java.lang.String">
+ <xsl:value-of select="@name" />
+ </Arg>
+ <Arg type="java.lang.String">
+ <xsl:value-of select="@value" />
+ </Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+ </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
Added:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/jetty-env.xml
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/jetty-env.xml
(rev 0)
+++
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/jetty-env.xml
2010-04-03 14:53:18 UTC (rev 41756)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN"
"http://www.eclipse.org/jetty/configure.dtd";>
+<Configure class="org.eclipse.jetty.webapp.WebAppContext">
+ <New class="org.eclipse.jetty.plus.jndi.Resource">
+ <Arg>mail/Session</Arg>
+ <Arg>
+ <New
class="org.eclipse.jetty.jndi.factories.MailSessionReference">
+ <Set name="properties">
+ <New class="java.util.Properties">
+ <Put
name="mail.smtp.host">MISSING.MAILSERVER</Put>
+ </New>
+ </Set>
+ </New>
+ </Arg>
+ </New>
+ <New class="org.eclipse.jetty.plus.jndi.Resource">
+ <Arg>jdbc/cmsc</Arg>
+ <Arg>
+ <New class="com.mchange.v2.c3p0.ComboPooledDataSource">
+ <Set
name="driverClass">com.mysql.jdbc.Driver</Set>
+ <Set
name="jdbcUrl">jdbc:mysql://localhost:3306/cmsc?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useServerPrepStmts=false</Set>
+ <Set name="user">cmsc</Set>
+ <Set name="password">cmsc</Set>
+ </New>
+ </Arg>
+ </New>
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg
type="java.lang.String">mmbase/mmbaseroot/datasource-context</Arg>
+ <Arg type="java.lang.String">java:comp/env</Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg type="java.lang.String">mmbase/mmbaseroot/datasource</Arg>
+ <Arg type="java.lang.String">jdbc/cmsc</Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg type="java.lang.String">mmbase/mmbaseroot/database</Arg>
+ <Arg type="java.lang.String">mysql-cmsc</Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg
type="java.lang.String">mmbase/imaging/ImageConvertClass</Arg>
+ <Arg
type="java.lang.String">org.mmbase.module.builders.ConvertImageMagick</Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg
type="java.lang.String">mmbase/imaging/ImageConvert.ConverterCommand</Arg>
+ <Arg type="java.lang.String">convert</Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg
type="java.lang.String">mmbase/imaging/ImageConvert.ConverterRoot</Arg>
+ <Arg type="java.lang.String"></Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg type="java.lang.String">server/LiveOrStaging</Arg>
+ <Arg type="java.lang.String">single</Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg type="java.lang.String">server/useServerName</Arg>
+ <Arg type="java.lang.String">false</Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg type="java.lang.String">server/production</Arg>
+ <Arg type="java.lang.String">false</Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg type="java.lang.String">server/readonly</Arg>
+ <Arg type="java.lang.String">false</Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+
+ <!-- Put the mmbase datadir also in the target directory -->
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg type="java.lang.String">mmbase/mmbaseroot/datadir</Arg>
+ <Arg type="java.lang.String">target/datadir</Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+</Configure>
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/login.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/login.jsp
2010-04-03 14:39:36 UTC (rev 41755)
+++
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/login.jsp
2010-04-03 14:53:18 UTC (rev 41756)
@@ -40,7 +40,7 @@
<cmscedit:sideblock title="login.title">
<!-- restricted url: <mm:write referid="referrer" /> -->
- <form method="post" action="<mm:url page='/editors/' />" target="_top">
+ <form method="post" action="<mm:url page='/editors/index.jsp' />"
target="_top">
<input type="hidden" name="command" value="login" />
<input type="hidden" name="cloud" value="mmbase" /><!-- also default
-->
<input type="hidden" name="authenticate" value="name/password" />
Modified: CMSContainer/trunk/CMSContainer/project-parent/pom.xml
===================================================================
--- CMSContainer/trunk/CMSContainer/project-parent/pom.xml 2010-04-03
14:39:36 UTC (rev 41755)
+++ CMSContainer/trunk/CMSContainer/project-parent/pom.xml 2010-04-03
14:53:18 UTC (rev 41756)
@@ -107,4 +107,53 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>jetty</id>
+ <build>
+ <defaultGoal>jetty:run</defaultGoal>
+ <plugins>
+ <plugin>
+
<groupId>org.mortbay.jetty</groupId>
+
<artifactId>jetty-maven-plugin</artifactId>
+ <version>7.0.2.RC0</version>
+ <configuration>
+ <webAppConfig>
+
<defaultsDescriptor>src/jetty/webdefault.xml</defaultsDescriptor>
+ </webAppConfig>
+ <systemProperties>
+ <!-- logs are
configured relatively from catalina.home -->
+ <systemProperty>
+
<name>catalina.home</name>
+
<value>${basedir}/target</value>
+
</systemProperty>
+ </systemProperties>
+
<scanIntervalSeconds>10</scanIntervalSeconds>
+ </configuration>
+ <dependencies>
+ <dependency>
+
<groupId>c3p0</groupId>
+
<artifactId>c3p0</artifactId>
+
<version>0.9.1.2</version>
+
<scope>runtime</scope>
+ </dependency>
+ <dependency>
+
<groupId>mysql</groupId>
+
<artifactId>mysql-connector-java</artifactId>
+
<version>5.1.6</version>
+
<scope>test</scope>
+ </dependency>
+
+ <dependency>
+
<groupId>hsqldb</groupId>
+
<artifactId>hsqldb</artifactId>
+
<version>1.8.0.7</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
Added:
CMSContainer/trunk/CMSContainer/server/AppServerConfig/src/main/java/org/cmscontainer/tools/appserver/ConfigGenerator.java
===================================================================
---
CMSContainer/trunk/CMSContainer/server/AppServerConfig/src/main/java/org/cmscontainer/tools/appserver/ConfigGenerator.java
(rev 0)
+++
CMSContainer/trunk/CMSContainer/server/AppServerConfig/src/main/java/org/cmscontainer/tools/appserver/ConfigGenerator.java
2010-04-03 14:53:18 UTC (rev 41756)
@@ -0,0 +1,32 @@
+package org.cmscontainer.tools.appserver;
+
+import java.io.*;
+import java.net.MalformedURLException;
+import java.util.HashMap;
+
+import javax.xml.transform.TransformerException;
+
+import com.finalist.cmsc.util.XsltUtil;
+
+
+public class ConfigGenerator {
+
+ public static void main(String[] args) throws MalformedURLException,
TransformerException, IOException {
+ ConfigGenerator generator = new ConfigGenerator();
+
+ HashMap<String, Object> xslParams = new HashMap<String, Object>();
+
+ File xml = new File(args[0]);
+
+ String jettyEnvXml = generator.transformXml("jetty/env.xsl", xml,
xslParams);
+ System.out.println(jettyEnvXml);
+ }
+
+ protected String transformXml(String xsl, Object xml, HashMap<String,
Object> xslParams)
+ throws TransformerException, IOException, MalformedURLException {
+
+ InputStream xslSrc = this.getClass().getResourceAsStream(xsl);
+ XsltUtil xsltUtil = new XsltUtil(xml, xslSrc, null);
+ return xsltUtil.transformToString(xslParams);
+ }
+}
Added:
CMSContainer/trunk/CMSContainer/server/AppServerConfig/src/main/java/org/cmscontainer/tools/appserver/jetty/env.xsl
===================================================================
---
CMSContainer/trunk/CMSContainer/server/AppServerConfig/src/main/java/org/cmscontainer/tools/appserver/jetty/env.xsl
(rev 0)
+++
CMSContainer/trunk/CMSContainer/server/AppServerConfig/src/main/java/org/cmscontainer/tools/appserver/jetty/env.xsl
2010-04-03 14:53:18 UTC (rev 41756)
@@ -0,0 +1,82 @@
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+
+ <xsl:output method="xml" version="1.0" encoding="utf-8" indent="yes"
+ doctype-public="-//Mort Bay Consulting//DTD Configure//EN"
+ doctype-system="http://www.eclipse.org/jetty/configure.dtd"; />
+
+ <xsl:template match="Context">
+ <!--
=============================================================== -->
+ <!-- Configure the Jetty Server
-->
+ <!--
-->
+ <!-- Documentation of this file format can be found at:
-->
+ <!-- http://docs.codehaus.org/display/JETTY/jetty.xml
-->
+ <!--
-->
+ <!--
=============================================================== -->
+ <Configure class="org.eclipse.jetty.webapp.WebAppContext">
+ <xsl:apply-templates select="Resource" />
+ <xsl:apply-templates select="Environment" />
+
+ <!-- Put the mmbase datadir also in the target
directory -->
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg
type="java.lang.String">mmbase/mmbaseroot/datadir</Arg>
+ <Arg
type="java.lang.String">target/datadir</Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+ </Configure>
+ </xsl:template>
+
+ <xsl:template match="resour...@type='javax.mail.Session']">
+ <New class="org.eclipse.jetty.plus.jndi.Resource">
+ <Arg>mail/Session</Arg>
+ <Arg>
+ <New
class="org.eclipse.jetty.jndi.factories.MailSessionReference">
+ <Set name="properties">
+ <New
class="java.util.Properties">
+ <Put
name="mail.smtp.host">
+ <xsl:value-of
select="@mail.smtp.host" />
+ </Put>
+ </New>
+ </Set>
+ </New>
+ </Arg>
+ </New>
+ </xsl:template>
+
+ <xsl:template match="resour...@type='javax.sql.DataSource']">
+ <New class="org.eclipse.jetty.plus.jndi.Resource">
+ <Arg>
+ <xsl:value-of select="@name" />
+ </Arg>
+ <Arg>
+ <New
class="com.mchange.v2.c3p0.ComboPooledDataSource">
+ <Set name="driverClass">
+ <xsl:value-of
select="@driverClassName" />
+ </Set>
+ <Set name="jdbcUrl">
+ <xsl:value-of select="@url" />
+ </Set>
+ <Set name="user">
+ <xsl:value-of
select="@username" />
+ </Set>
+ <Set name="password">
+ <xsl:value-of
select="@password" />
+ </Set>
+ </New>
+ </Arg>
+ </New>
+ </xsl:template>
+
+ <xsl:template match="Environment">
+ <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
+ <Arg type="java.lang.String">
+ <xsl:value-of select="@name" />
+ </Arg>
+ <Arg type="java.lang.String">
+ <xsl:value-of select="@value" />
+ </Arg>
+ <Arg type="boolean">true</Arg>
+ </New>
+ </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
