Author: solomax
Date: Wed Dec 30 11:00:09 2015
New Revision: 1722310
URL: http://svn.apache.org/viewvc?rev=1722310&view=rev
Log:
Site generation is fixed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/stylesheets/errortable.xsl
openmeetings/application/trunk/openmeetings-server/pom.xml
openmeetings/application/trunk/openmeetings-server/src/site/stylesheets/errortable.xsl
Modified: openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml?rev=1722310&r1=1722309&r2=1722310&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml
(original)
+++ openmeetings/application/branches/3.1.x/openmeetings-server/pom.xml Wed Dec
30 11:00:09 2015
@@ -31,6 +31,7 @@
<description>TODO</description>
<properties>
<server.dir>${project.build.directory}/red5-server</server.dir>
+
<webapp.languages.dir>../openmeetings-web/src/main/webapp/languages</webapp.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>
@@ -191,7 +192,7 @@
<configuration>
<transformationSets>
<transformationSet>
-
<dir>${languages.dir}</dir>
+
<dir>${webapp.languages.dir}</dir>
<includes>
<include>errorvalues.xml</include>
</includes>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/stylesheets/errortable.xsl
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/src/site/stylesheets/errortable.xsl?rev=1722310&r1=1722309&r2=1722310&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/stylesheets/errortable.xsl
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/stylesheets/errortable.xsl
Wed Dec 30 11:00:09 2015
@@ -55,8 +55,8 @@
<tr>
<td>-<xsl:value-of
select="field[@name='errorvalues_id']"/></td>
<td>
- <xsl:variable name="type"
select="field[@name='type']"/>
- <xsl:value-of
select="document($englishPath)/properties/entry[@key=error.type.$type]/text()"
/>
+ <xsl:variable name="type"
select="concat('error.type.', field[@name='type'])"/>
+ <xsl:value-of
select="document($englishPath)/properties/entry[@key=$type]/text()" />
</td>
<td>
<xsl:variable name="descId"
select="field[@name='fieldvalues_id']"/>
Modified: openmeetings/application/trunk/openmeetings-server/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/pom.xml?rev=1722310&r1=1722309&r2=1722310&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-server/pom.xml (original)
+++ openmeetings/application/trunk/openmeetings-server/pom.xml Wed Dec 30
11:00:09 2015
@@ -31,6 +31,7 @@
<description>TODO</description>
<properties>
<server.dir>${project.build.directory}/red5-server</server.dir>
+
<webapp.languages.dir>../openmeetings-web/src/main/webapp/languages</webapp.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>
@@ -191,7 +192,7 @@
<configuration>
<transformationSets>
<transformationSet>
-
<dir>${languages.dir}</dir>
+
<dir>${webapp.languages.dir}</dir>
<includes>
<include>errorvalues.xml</include>
</includes>
Modified:
openmeetings/application/trunk/openmeetings-server/src/site/stylesheets/errortable.xsl
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/stylesheets/errortable.xsl?rev=1722310&r1=1722309&r2=1722310&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-server/src/site/stylesheets/errortable.xsl
(original)
+++
openmeetings/application/trunk/openmeetings-server/src/site/stylesheets/errortable.xsl
Wed Dec 30 11:00:09 2015
@@ -55,8 +55,8 @@
<tr>
<td>-<xsl:value-of
select="field[@name='errorvalues_id']"/></td>
<td>
- <xsl:variable name="type"
select="field[@name='type']"/>
- <xsl:value-of
select="document($englishPath)/properties/entry[@key=error.type.$type]/text()"
/>
+ <xsl:variable name="type"
select="concat('error.type.', field[@name='type'])"/>
+ <xsl:value-of
select="document($englishPath)/properties/entry[@key=$type]/text()" />
</td>
<td>
<xsl:variable name="descId"
select="field[@name='fieldvalues_id']"/>
