[Yanel-commits] rev 44332 - in public/yanel/trunk/src/build: .
resource-types targets targets/webapp
michi at wyona.com
michi at wyona.com
Fri Aug 21 14:41:38 CEST 2009
Author: michi
Date: 2009-08-21 14:41:37 +0200 (Fri, 21 Aug 2009)
New Revision: 44332
Modified:
public/yanel/trunk/src/build/build.properties
public/yanel/trunk/src/build/build.xml
public/yanel/trunk/src/build/resource-types/resource-type.build.xml
public/yanel/trunk/src/build/targets/add-third-party-realm.xml
public/yanel/trunk/src/build/targets/cmdl.xml
public/yanel/trunk/src/build/targets/realms.xml
public/yanel/trunk/src/build/targets/resources.xml
public/yanel/trunk/src/build/targets/webapp/webapp.xml
public/yanel/trunk/src/build/yanel2realms.xsl
Log:
set javac encoding explicitely because for example Mac OS X seems to use MacRoman which leads to problems on other computers and vice versa
Modified: public/yanel/trunk/src/build/build.properties
===================================================================
--- public/yanel/trunk/src/build/build.properties 2009-08-21 11:39:30 UTC (rev 44331)
+++ public/yanel/trunk/src/build/build.properties 2009-08-21 12:41:37 UTC (rev 44332)
@@ -65,6 +65,9 @@
# TODO: One needs to un-comment the RollingFileAppender ...
#log4j.path=/home/USER
+# Javac encoding
+javac.encoding=UTF-8
+
#Certificate
certificate.common.name = localhost
certificate.organisation = Wyona.com
Modified: public/yanel/trunk/src/build/build.xml
===================================================================
--- public/yanel/trunk/src/build/build.xml 2009-08-21 11:39:30 UTC (rev 44331)
+++ public/yanel/trunk/src/build/build.xml 2009-08-21 12:41:37 UTC (rev 44332)
@@ -122,6 +122,7 @@
destdir="${classes.dir}"
source="${source.java.version}"
target="${target.java.version}"
+ encoding="${javac.encoding}"
debug="true">
<classpath refid="classpath.compile"/>
</javac>
@@ -140,6 +141,7 @@
destdir="${classes.dir}"
source="${source.java.version}"
target="${target.java.version}"
+ encoding="${javac.encoding}"
debug="true">
<classpath refid="classpath.compile"/>
</javac>
@@ -154,7 +156,10 @@
<target name="compile-impl-classes" description="Compile Java classes of Yanel implementation" depends="init, compile-core">
<mkdir dir="${classes.dir}"/>
- <javac srcdir="${yanel.source.home}/src/impl/java/org/wyona/yanel/impl" destdir="${classes.dir}" debug="true">
+ <javac srcdir="${yanel.source.home}/src/impl/java/org/wyona/yanel/impl"
+ destdir="${classes.dir}"
+ encoding="${javac.encoding}"
+ debug="true">
<classpath refid="classpath.compile"/>
</javac>
</target>
Modified: public/yanel/trunk/src/build/resource-types/resource-type.build.xml
===================================================================
--- public/yanel/trunk/src/build/resource-types/resource-type.build.xml 2009-08-21 11:39:30 UTC (rev 44331)
+++ public/yanel/trunk/src/build/resource-types/resource-type.build.xml 2009-08-21 12:41:37 UTC (rev 44332)
@@ -92,6 +92,7 @@
<mkdir dir="${resource.classes.dir}"/>
<javac srcdir="${resource.java.dir}" destdir="${resource.classes.dir}"
classpathref="classpath"
+ encoding="${javac.encoding}"
debug="true"
/>
<!-- Replace dot by forward slash -->
Modified: public/yanel/trunk/src/build/targets/add-third-party-realm.xml
===================================================================
--- public/yanel/trunk/src/build/targets/add-third-party-realm.xml 2009-08-21 11:39:30 UTC (rev 44331)
+++ public/yanel/trunk/src/build/targets/add-third-party-realm.xml 2009-08-21 12:41:37 UTC (rev 44332)
@@ -13,6 +13,7 @@
<target name="build-add-realm-task" depends="init, compile-core">
<javac srcdir="${yanel.source.home}/src/build/java"
+ encoding="${javac.encoding}"
destdir="${yanel.source.home}/build/classes"
/>
</target>
Modified: public/yanel/trunk/src/build/targets/cmdl.xml
===================================================================
--- public/yanel/trunk/src/build/targets/cmdl.xml 2009-08-21 11:39:30 UTC (rev 44331)
+++ public/yanel/trunk/src/build/targets/cmdl.xml 2009-08-21 12:41:37 UTC (rev 44332)
@@ -46,6 +46,7 @@
<mkdir dir="${classes.dir}"/>
<javac srcdir="${yanel.source.home}/src/core/java/org/wyona/yanel/cmdl" destdir="${classes.dir}"
debug="true"
+ encoding="${javac.encoding}"
classpathref="classpath.cmdl"
/>
</target>
Modified: public/yanel/trunk/src/build/targets/realms.xml
===================================================================
--- public/yanel/trunk/src/build/targets/realms.xml 2009-08-21 11:39:30 UTC (rev 44331)
+++ public/yanel/trunk/src/build/targets/realms.xml 2009-08-21 12:41:37 UTC (rev 44332)
@@ -41,6 +41,7 @@
<xslt in="${yanel.source.home}/conf/realms.xml" out="../../build/build-realms.xml" style="yanel2realms.xsl" force="false">
<param name="servlet.context.prefix" expression="${servlet.context.prefix}"/>
<param name="yanel.source.version" expression="${yanel.version}-r${yanel.revision}"/>
+ <param name="yanel.source.home" expression="${yanel.source.home}"/>
<param name="maven.url" expression="${maven.url}"/>
</xslt>
@@ -57,6 +58,7 @@
<xslt in="${local.config.home}/local.realms.xml" out="../../build/build-realms.xml" style="yanel2realms.xsl" force="true">
<param name="servlet.context.prefix" expression="${servlet.context.prefix}"/>
<param name="yanel.source.version" expression="${yanel.version}-r${yanel.revision}"/>
+ <param name="yanel.source.home" expression="${yanel.source.home}"/>
<param name="maven.url" expression="${maven.url}"/>
</xslt>
Modified: public/yanel/trunk/src/build/targets/resources.xml
===================================================================
--- public/yanel/trunk/src/build/targets/resources.xml 2009-08-21 11:39:30 UTC (rev 44331)
+++ public/yanel/trunk/src/build/targets/resources.xml 2009-08-21 12:41:37 UTC (rev 44332)
@@ -13,6 +13,7 @@
<!-- Build custom ant tasks -->
<javac srcdir="${yanel.source.home}/src/build/java"
+ encoding="${javac.encoding}"
destdir="${classes.dir}">
<classpath refid="classpath.compile"/>
</javac>
Modified: public/yanel/trunk/src/build/targets/webapp/webapp.xml
===================================================================
--- public/yanel/trunk/src/build/targets/webapp/webapp.xml 2009-08-21 11:39:30 UTC (rev 44331)
+++ public/yanel/trunk/src/build/targets/webapp/webapp.xml 2009-08-21 12:41:37 UTC (rev 44332)
@@ -181,6 +181,7 @@
<mkdir dir="${classes.dir}"/>
<javac srcdir="${yanel.source.home}/src/webapp/src/java/org/wyona/yanel/servlet" destdir="${classes.dir}"
debug="true"
+ encoding="${javac.encoding}"
classpathref="classpath.compile"
/>
</target>
Modified: public/yanel/trunk/src/build/yanel2realms.xsl
===================================================================
--- public/yanel/trunk/src/build/yanel2realms.xsl 2009-08-21 11:39:30 UTC (rev 44331)
+++ public/yanel/trunk/src/build/yanel2realms.xsl 2009-08-21 12:41:37 UTC (rev 44332)
@@ -9,6 +9,7 @@
<xsl:param name="servlet.context.prefix" select="'NULL_servlet_context_prefix'"/>
<xsl:param name="yanel.source.version" select="'NULL_yanel_source_version'"/>
+<xsl:param name="yanel.source.home" select="'NULL_yanel_source_home'"/>
<xsl:param name="maven.url" select="'NULL_maven_url'"/>
<xsl:template match="/">
@@ -52,6 +53,7 @@
<echo>Build realm with id "<xsl:value-of select="@id"/>"</echo>
<ant inheritAll="false" antfile="{yanel:config/@src}/build.xml" target="compile">
<property name="yanel.source.version" value="{$yanel.source.version}"/>
+ <property name="yanel.source.home" value="{$yanel.source.home}"/>
<property name="maven.url" value="{$maven.url}"/>
</ant>
</target>
More information about the Yanel-commits
mailing list