Author: solomax
Date: Sun Apr 19 18:25:32 2015
New Revision: 1674665
URL: http://svn.apache.org/r1674665
Log:
[OPENMEETINGS-1198] build is fixed
Modified:
openmeetings/branches/3.0.x/xdocs/stylesheets/errortable.xsl
openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/stylesheets/errortable.xsl
Modified: openmeetings/branches/3.0.x/xdocs/stylesheets/errortable.xsl
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/xdocs/stylesheets/errortable.xsl?rev=1674665&r1=1674664&r2=1674665&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/xdocs/stylesheets/errortable.xsl (original)
+++ openmeetings/branches/3.0.x/xdocs/stylesheets/errortable.xsl Sun Apr 19
18:25:32 2015
@@ -60,11 +60,11 @@
<xsl:otherwise>323</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- <xsl:value-of
select="document('../../src/main/webapp/languages/english.xml')/language/string[@id=$x]/value"
/>
+ <xsl:value-of
select="document('../../src/web/java/org/apache/openmeetings/web/app/Application.properties.xml')/properties/entry[@key=$x]/text()"
/>
</td>
<td>
<xsl:variable name="descId"
select="field[@name='fieldvalues_id']"/>
- <xsl:value-of
select="document('../../src/main/webapp/languages/english.xml')/language/string[@id=$descId]/value"
/>
+ <xsl:value-of
select="document('../../src/web/java/org/apache/openmeetings/web/app/Application.properties.xml')/properties/entry[@key=$descId]/text()"
/>
</td>
</tr>
</xsl:template>
Modified: openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml?rev=1674665&r1=1674664&r2=1674665&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml Sun Apr 19
18:25:32 2015
@@ -31,7 +31,7 @@
<description>TODO</description>
<properties>
<server.dir>${project.build.directory}/red5-server</server.dir>
-
<languages.dir>../openmeetings-web/src/main/webapp/languages</languages.dir>
+
<languages.dir>../openmeetings-web/src/main/java/org/apache/openmeetings/web/app</languages.dir>
<assembly.finalName>${project.build.finalName}</assembly.finalName>
<assembly.descriptor>server</assembly.descriptor>
<dist.dir>${project.build.directory}/${assembly.finalName}</dist.dir>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/stylesheets/errortable.xsl
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/stylesheets/errortable.xsl?rev=1674665&r1=1674664&r2=1674665&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/stylesheets/errortable.xsl
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/stylesheets/errortable.xsl
Sun Apr 19 18:25:32 2015
@@ -51,7 +51,7 @@
</xsl:template>
<xsl:template match="row">
- <xsl:variable name="englishPath"><xsl:value-of
select="concat($languagesDir, '/english.xml')"/></xsl:variable>
+ <xsl:variable name="englishPath"><xsl:value-of
select="concat($languagesDir, '/Application.properties.xml')"/></xsl:variable>
<tr>
<td>-<xsl:value-of
select="field[@name='errorvalues_id']"/></td>
<td>
@@ -62,11 +62,11 @@
<xsl:otherwise>323</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- <xsl:value-of
select="document($englishPath)/language/string[@id=$x]/value" />
+ <xsl:value-of
select="document($englishPath)/properties/entry[@key=$x]/text()" />
</td>
<td>
<xsl:variable name="descId"
select="field[@name='fieldvalues_id']"/>
- <xsl:value-of
select="document($englishPath)/language/string[@id=$descId]/value" />
+ <xsl:value-of
select="document($englishPath)/properties/entry[@key=$descId]/text()" />
</td>
</tr>
</xsl:template>
