Merge branch 'master' into basic-auth

wyona · Nov 17, 2012 · b417097 · b417097
2 parents 129800b + a3eb6b1
commit b417097
Show file tree

Hide file tree

Showing 25 changed files with 479 additions and 181 deletions.
diff --git a/src/build/dependencies.xml b/src/build/dependencies.xml
@@ -47,7 +47,7 @@
       <dependency groupId="org.eclipse.persistence" artifactId="org.eclipse.persistence.moxy" version="2.3.2"/>
 
       <!-- IMPORTANT: Please make sure to update pom-core.xml as well! -->
-      <dependency groupId="yarep" artifactId="yarep-core" version="1.0-dev-rad19798901b2280b7236e915ae96746ab630fcc1"/>
+      <dependency groupId="yarep" artifactId="yarep-core" version="1.0.1-r91cff3e04f95401bcfcaf7c03c959d8923991cd3"/>
 
       <!-- IMPORTANT: Please make sure to update pom-core.xml as well! -->
       <dependency groupId="wyona-org-commons" artifactId="wyona-org-commons" version="1.0.0-r565cd3885372038f6076df65376a1ccd17b07c5e"/>
@@ -90,7 +90,7 @@
       <dependency groupId="wyona-org-security" artifactId="wyona-org-security-impl" version="1.4.0-r371596de3c510604aadb5718fc7b92296f48c3ba"/>
       <dependency groupId="wyona-org-security" artifactId="wyona-org-security-util" version="1.4.0-r371596de3c510604aadb5718fc7b92296f48c3ba"/>
       <!-- IMPORTANT: Please make sure to update pom-core.xml as well! -->
-      <dependency groupId="yarep" artifactId="yarep-impl" version="1.0-dev-rad19798901b2280b7236e915ae96746ab630fcc1"/>
+      <dependency groupId="yarep" artifactId="yarep-impl" version="1.0.1-r91cff3e04f95401bcfcaf7c03c959d8923991cd3"/>
       <dependency groupId="spring" artifactId="spring"
                   version="2.0"/>
       <dependency groupId="svnkit" artifactId="svnkit"

diff --git a/src/build/pom-core.xml b/src/build/pom-core.xml
@@ -28,13 +28,13 @@
       <groupId>yarep</groupId>
       <artifactId>yarep-core</artifactId>
       <!-- IMPORTANT: Please make sure to update dependencies.xml as well! -->
-      <version>1.0-dev-rad19798901b2280b7236e915ae96746ab630fcc1</version>
+      <version>1.0.1-r91cff3e04f95401bcfcaf7c03c959d8923991cd3</version>
     </dependency>
     <dependency>
       <groupId>yarep</groupId>
       <artifactId>yarep-impl</artifactId>
       <!-- IMPORTANT: Please make sure to update dependencies.xml as well! -->
-      <version>1.0-dev-rad19798901b2280b7236e915ae96746ab630fcc1</version>
+      <version>1.0.1-r91cff3e04f95401bcfcaf7c03c959d8923991cd3</version>
     </dependency>
     <dependency>
       <groupId>wyona-org-commons</groupId>

diff --git a/src/realms/yanel-website/data-repo/data/google-analytics-key-config.xml b/src/realms/yanel-website/data-repo/data/google-analytics-key-config.xml
@@ -4,7 +4,7 @@
 
 <configuration>
   <!--WARNING: Do not commit a real, non-test key, or else statistics will be spoiled! -->
-  <Google-Analytics key="UA-Yanel***-*"/>
+  <Google-Analytics key="UA-Yanel***-*" target-environment="dev"/>
 
   <!-- LIVE Key for www.yanel.org -->
 <!--

diff --git a/src/realms/yanel-website/data-repo/data/license.xhtml b/src/realms/yanel-website/data-repo/data/license.xhtml
diff --git a/src/realms/yanel-website/data-repo/data/xslt/global.xsl b/src/realms/yanel-website/data-repo/data/xslt/global.xsl
@@ -38,7 +38,10 @@ WARNING: This content has been generated dynamically. All changes will be lost.
 <head>
 <xsl:comment>Name: <xsl:value-of select="$yanel.path.name"/> (without suffix: <xsl:value-of select="$name-without-suffix"/>), Path: <xsl:value-of select="$yanel.path"/>, Back 2 Realm: <xsl:value-of select="$yarep.back2realm"/>, Back 2 Context: <xsl:value-of select="$yanel.back2context"/></xsl:comment>
 
+<!-- INFO: Since the title is inserted via i18n inside src/resources/contact-form/htdocs/xslt/contact-form.xsl, we need to copy the tags (instead using the value), because the i18n transformer is only applied at the very end of the pipeline!
   <title><xsl:value-of select="/xhtml:html/xhtml:head/xhtml:title"/> - Yanel</title>
+-->
+  <title><xsl:copy-of select="/xhtml:html/xhtml:head/xhtml:title/node()"/> - Yanel</title>
 
   <!-- This is needed such that Microsoft Internet Explorer displays characters such as &nbsp; correctly (also see xsl:output, whereas I (Michi) am not sure if the encoding is really needed there) -->
   <meta content="application/xhtml+xml; charset=UTF-8" http-equiv="Content-Type"/>
@@ -114,7 +117,7 @@ WARNING: This content has been generated dynamically. All changes will be lost.
   <td colspan="2" id="footer">
 
     <i18n:text key="poweredBy"/><xsl:text> </xsl:text><a href="http://yanel.wyona.org">Wyona Yanel</a> | <a href="http://raw.github.com/wyona/tomcat-cluster/">Wyona Balancer</a> | <a href="http://tomcat.apache.org">Apache Tomcat</a> | <a href="http://httpd.apache.org">Apache HTTP Server</a><br/>
-    Copyright &#169; 2011 <a href="http://www.wyona.com">Wyona</a>. <i18n:text key="allRightsReserved"/>. - <a href="?yanel.resource.meta"><i18n:text key="pageInfo"/></a> - <a href="?yanel.toolbar=on">Toolbar</a> - <a href="http://donottrack.us/" target="_blank">Do not track</a>: <xsl:value-of select="$do.not.track"/>
+    Copyright &#169; 2011 <a href="http://www.wyona.com">Wyona</a>. <i18n:text key="allRightsReserved"/>. - <a href="?yanel.resource.meta"><i18n:text key="pageInfo"/></a> - <a href="?yanel.toolbar=on">Toolbar</a> - <a href="{$yarep.back2realm}my-profile.html">Do not track</a>: <xsl:value-of select="$do.not.track"/>
 
   </td>
 </tr>

diff --git a/src/realms/yanel-website/data-repo/yarep-meta/en/documentation/i18n.html.yarep/meta b/src/realms/yanel-website/data-repo/yarep-meta/en/documentation/i18n.html.yarep/meta
@@ -1,8 +1,10 @@
+yarep_vfs-meta-file-version<string>:1.0
 yarep_size<long>:3704
-yarep_checkinDate<date>:2008-03-05T17:33:38:000+0100
-yarep_lastModifed<long>:1204734818000
+yarep_checkinDate<date>:2008-03-05T11\:33\:38\:000-0500
 yarep_type<string>:resource
+yarep_lastModifed<long>:1204734818000
+yarep_mimeType<string>:application/xhtml+xml
+annotations<string>:internationalization, i18n
 yarep_checkoutUserID<string>:lenya
-yarep_checkoutDate<date>:2008-03-05T17:28:31:000+0100
 yarep_isCheckedOut<boolean>:false
-yarep_mimeType<string>:application/xhtml+xml
+yarep_checkoutDate<date>:2008-03-05T11\:28\:31\:000-0500
diff --git a/src/realms/yanel-website/data-repo/yarep-meta/en/documentation/index.html.yarep/meta b/src/realms/yanel-website/data-repo/yarep-meta/en/documentation/index.html.yarep/meta
@@ -3,7 +3,8 @@ yarep_size<long>:7589
 yarep_checkinDate<date>:2011-02-16T15\:40\:50\:650+0100
 yarep_lastModifed<long>:1275913276000
 yarep_type<string>:resource
+yarep_mimeType<string>:application/xhtml+xml
 yarep_checkoutUserID<string>:alice
+annotations<string>:Documentation Table of Contents
 yarep_checkoutDate<date>:2011-02-16T15\:39\:34\:098+0100
 yarep_isCheckedOut<boolean>:false
-yarep_mimeType<string>:application/xhtml+xml
diff --git a/...e/data-repo/yarep-meta/en/documentation/misc/google-analytics-integration.html.yarep/meta b/...e/data-repo/yarep-meta/en/documentation/misc/google-analytics-integration.html.yarep/meta
@@ -1,2 +1,4 @@
+yarep_vfs-meta-file-version<string>:1.0
 yarep_type<string>:resource
 yarep_mimeType<string>:application/xhtml+xml
+annotations<string>:Google analytics integration
diff --git a/src/realms/yanel-website/data-repo/yarep-meta/en/documentation/misc/xopus3.html.yarep/meta b/src/realms/yanel-website/data-repo/yarep-meta/en/documentation/misc/xopus3.html.yarep/meta
@@ -1,2 +1,4 @@
+yarep_vfs-meta-file-version<string>:1.0
 yarep_type<string>:resource
-yarep_mimeType<string>:application/xhtml+xml
+yarep_mimeType<string>:application/xhtml+xml
+annotations<string>:Xopus
diff --git a/src/realms/yanel-website/data-repo/yarep-meta/en/getting-started/windows.html.yarep/meta b/src/realms/yanel-website/data-repo/yarep-meta/en/getting-started/windows.html.yarep/meta
@@ -1,5 +1,7 @@
+yarep_vfs-meta-file-version<string>:1.0
 yarep_type<string>:resource
+yarep_mimeType<string>:application/xhtml+xml
 yarep_checkoutUserID<string>:lenya
-yarep_checkoutDate<date>:2007-05-12T21:50:54:000+0200
+annotations<string>:Getting started on Windows
+yarep_checkoutDate<date>:2007-05-12T15\:50\:54\:000-0400
 yarep_isCheckedOut<boolean>:false
-yarep_mimeType<string>:application/xhtml+xml
diff --git a/src/realms/yanel-website/data-repo/yarep-meta/license.html.yarep/meta b/src/realms/yanel-website/data-repo/yarep-meta/license.html.yarep/meta
@@ -1,8 +1,9 @@
 yarep_vfs-meta-file-version<string>:1.0
 yarep_checkinDate<date>:2011-02-17T11\:13\:34\:679+0100
 yarep_type<string>:resource
+yarep_mimeType<string>:application/xhtml+xml
 yarep_checkoutUserID<string>:alice
+annotations<string>:License
 yarep_checkoutDate<date>:2011-02-17T11\:12\:50\:356+0100
 yarep_isCheckedOut<boolean>:false
 live-revision<string>:1297937613462
-yarep_mimeType<string>:application/xhtml+xml
diff --git a/src/realms/yanel-website/data-repo/yarep-meta/license.xhtml.yarep/meta b/src/realms/yanel-website/data-repo/yarep-meta/license.xhtml.yarep/meta
diff --git a/src/realms/yanel-website/data-repo/yarep-meta/principles.html.yarep/meta b/src/realms/yanel-website/data-repo/yarep-meta/principles.html.yarep/meta
@@ -1,8 +1,10 @@
+yarep_vfs-meta-file-version<string>:1.0
 yarep_size<long>:1997
-yarep_checkinDate<date>:2008-11-14T15:21:03:000+0100
+yarep_checkinDate<date>:2008-11-14T15\:21\:03\:000+0100
 yarep_lastModifed<long>:1226672463000
 yarep_type<string>:resource
+yarep_mimeType<string>:application/xhtml+xml
 yarep_checkoutUserID<string>:michi
-yarep_checkoutDate<date>:2008-11-14T15:19:29:000+0100
+annotations<string>:Principles
+yarep_checkoutDate<date>:2008-11-14T15\:19\:29\:000+0100
 yarep_isCheckedOut<boolean>:false
-yarep_mimeType<string>:application/xhtml+xml
diff --git a/src/realms/yanel-website/res-configs-repo/data/en/contact.html.yanel-rc b/src/realms/yanel-website/res-configs-repo/data/en/contact.html.yanel-rc
@@ -15,6 +15,9 @@
   <yanel:property name="to" value="contact@wyona.com"/>
   <yanel:property name="to" value="michael.wechner@wyona.com" target-environment="dev"/>
 
+  <yanel:property name="back-link-base-url" value="http://www.yanel.org"/>
+  <yanel:property name="back-link-base-url" value="http://127.0.0.1:8080/yanel/yanel-website" target-environment="dev"/>
+
   <!-- Alternative SMTP configuration. If the below is commented, then the default settings of Yanel will be used which are configured within WEB-INF/classes/yanel.xml (also see the source configuration at conf/yanel.xml or rather make a copy at conf/local/local.yanel.xml) -->
 <!--
   <yanel:property name="smtpHost" value="mail.wyona.com"/>
@@ -30,6 +33,15 @@
         <serializer key="HTML_TRANSITIONAL">
         </serializer>
       </view>
+      <view id="message">
+<!-- DEBUG
+        <mime-type>application/xml</mime-type>
+-->
+        <xslt>rthtdocs:/xslt/message.xsl</xslt>
+        <xslt>/xslt/global.xsl</xslt>
+        <mime-type>text/html</mime-type>
+        <serializer key="HTML_TRANSITIONAL"/>
+      </view>
       <view id="xml">
         <mime-type>application/xml</mime-type>
       </view>

diff --git a/.../res-configs-repo/data/boost.xml.yanel-rc → ...onfigs-repo/data/my-profile.html.yanel-rc b/.../res-configs-repo/data/boost.xml.yanel-rc → ...onfigs-repo/data/my-profile.html.yanel-rc
@@ -7,4 +7,19 @@
 
   <yanel:property name="boost-service-url" value="http://localhost:9080/boost/api"/>
   <yanel:property name="boost-api-key" value="28b1e2ccc6804582208360370c73d4ad1da4b5f0ab8faf322dc65296fe8b68a5"/>
+
+  <yanel:custom-config>
+    <views xmlns="http://www.wyona.org/yanel/rti/1.0">
+      <view id="default">
+        <xslt>rthtdocs:/xslt/profile.xsl</xslt>
+        <xslt>/xslt/global.xsl</xslt>
+        <xslt>/xslt/apply-google-analytics.xsl</xslt>
+        <mime-type>text/html</mime-type>
+        <serializer key="HTML_TRANSITIONAL"/>
+      </view>
+      <view id="xml">
+        <mime-type>application/xml</mime-type>
+      </view>
+    </views>
+  </yanel:custom-config>
 </yanel:resource-config>
diff --git a/src/resources/contact-form/htdocs/xslt/message.xsl b/src/resources/contact-form/htdocs/xslt/message.xsl
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:xhtml="http://www.w3.org/1999/xhtml"
+  xmlns:i18n="http://www.wyona.org/yanel/i18n/1.0"
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:msg="http://www.wyona.org/yanel/contact-message/1.0.0"
+>
+
+  <xsl:output method="xhtml" encoding="UTF-8"/>
+
+  <xsl:template match="/">
+    <html xmlns="http://www.w3.org/1999/xhtml">
+      <head>
+        <title>Message</title>
+      </head>
+
+      <body>
+        <h3>Contact Message: <xsl:value-of select="/msg:message/@uuid"/></h3>
+
+        Company: <xsl:value-of select="/msg:message/msg:company"/>
+<br/>
+        Firstname: <xsl:value-of select="/msg:message/msg:firstname"/>
+<br/>
+        Lastname: <xsl:value-of select="/msg:message/msg:lastname"/>
+<br/>
+        Address: <xsl:value-of select="/msg:message/msg:address"/>
+<br/>
+        City: <xsl:value-of select="/msg:message/msg:city"/>
+<br/>
+        E-Mail: <xsl:value-of select="/msg:message/msg:e-mail"/>
+<br/><br/>
+        Message:<p><xsl:value-of select="/msg:message/msg:body"/></p>
+<br/>
+<!-- TODO: Use back2realm -->
+        User Profile (Clickstream, etc.): <a href="../my-profile.html?cookie-id={/msg:message/@yanel-analytics-cookie}"><xsl:value-of select="/msg:message/@yanel-analytics-cookie"/></a>
+      </body>
+    </html>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/src/resources/contact-form/resource-v2.xml b/src/resources/contact-form/resource-v2.xml
@@ -17,9 +17,10 @@ Contact form for sending email
   <!-- Optional properties -->
   <property name="subject"/>
   <property name="mime-type"/>
-  <property name="from"/> <!-- INFO: If not configured then the email address specified of the form is used as from address -->
+  <property name="from"/> <!-- INFO: If not configured, then the email address specified of the form is used as from address -->
   <property name="email-validation-regex"/>
-  <!-- NOTE: Please note that one needs to reload/restart Yanel in order to activate changes of host and port! -->
+  <property name="back-link-base-url"/>
+  <!-- NOTE: If not configured, then the global configuration from 'yanel.xml' will be used. Please note that one needs to reload/restart Yanel in order to activate changes of host and port! -->
   <property name="smtpHost"/>
   <property name="smtpPort"/>
 </rtd>

diff --git a/src/resources/contact-form/src/build/build.properties b/src/resources/contact-form/src/build/build.properties
@@ -1,2 +1,4 @@
 resource.name=contact-form
-resource.version=1.0-dev-r43764
+resource.version=2.0.0
+# Versions according to http://semver.org
+# 2.0.0: XML and XSLT moved to htdocs directory such that these files are accessible via rthtdocs protocol