You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2009/03/31 22:55:01 UTC
svn commit: r760614 - in /labs/magma/trunk/fragment-google-ads-xhtml: ./
src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/
src/main/java/org/apache/magma/ src/main/java/org/apache/magma/web/
src/main/java/org/apache/magma/web/g...
Author: simoneg
Date: Tue Mar 31 20:55:00 2009
New Revision: 760614
URL: http://svn.apache.org/viewvc?rev=760614&view=rev
Log:
LABS-329 : Google ads XHTML compliant
Added:
labs/magma/trunk/fragment-google-ads-xhtml/pom.xml
labs/magma/trunk/fragment-google-ads-xhtml/src/
labs/magma/trunk/fragment-google-ads-xhtml/src/main/
labs/magma/trunk/fragment-google-ads-xhtml/src/main/java/
labs/magma/trunk/fragment-google-ads-xhtml/src/main/java/org/
labs/magma/trunk/fragment-google-ads-xhtml/src/main/java/org/apache/
labs/magma/trunk/fragment-google-ads-xhtml/src/main/java/org/apache/magma/
labs/magma/trunk/fragment-google-ads-xhtml/src/main/java/org/apache/magma/web/
labs/magma/trunk/fragment-google-ads-xhtml/src/main/java/org/apache/magma/web/google/
labs/magma/trunk/fragment-google-ads-xhtml/src/main/java/org/apache/magma/web/google/ads/
labs/magma/trunk/fragment-google-ads-xhtml/src/main/java/org/apache/magma/web/google/ads/EmptyAdsTemplate.java
labs/magma/trunk/fragment-google-ads-xhtml/src/main/java/org/apache/magma/web/google/ads/InterceptAds.aj
labs/magma/trunk/fragment-google-ads-xhtml/src/main/resources/
labs/magma/trunk/fragment-google-ads-xhtml/src/main/resources/org/
labs/magma/trunk/fragment-google-ads-xhtml/src/main/resources/org/apache/
labs/magma/trunk/fragment-google-ads-xhtml/src/main/resources/org/apache/magma/
labs/magma/trunk/fragment-google-ads-xhtml/src/main/resources/org/apache/magma/web/
labs/magma/trunk/fragment-google-ads-xhtml/src/main/resources/org/apache/magma/web/google/
labs/magma/trunk/fragment-google-ads-xhtml/src/main/resources/org/apache/magma/web/google/ads/
labs/magma/trunk/fragment-google-ads-xhtml/src/main/resources/org/apache/magma/web/google/ads/emptyAdsTemplate.html
labs/magma/trunk/fragment-google-ads-xhtml/src/main/resources/org/apache/magma/web/google/ads/xhtmlGoogleAdsInclude-head.vm
labs/magma/trunk/fragment-google-ads-xhtml/src/main/resources/org/apache/magma/web/google/ads/xhtmlGoogleAdsInclude.vm
labs/magma/trunk/fragment-google-ads-xhtml/src/test/
labs/magma/trunk/fragment-google-ads-xhtml/src/test/java/
labs/magma/trunk/fragment-google-ads-xhtml/src/test/resources/
Added: labs/magma/trunk/fragment-google-ads-xhtml/pom.xml
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-google-ads-xhtml/pom.xml?rev=760614&view=auto
==============================================================================
--- labs/magma/trunk/fragment-google-ads-xhtml/pom.xml (added)
+++ labs/magma/trunk/fragment-google-ads-xhtml/pom.xml Tue Mar 31 20:55:00 2009
@@ -0,0 +1,19 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>magma-parent</artifactId>
+ <groupId>org.apache.magma</groupId>
+ <version>1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.magma</groupId>
+ <artifactId>fragment-google-ads-xhtml</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>magma</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.magma</groupId>
+ <artifactId>fragment-google-ads</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: labs/magma/trunk/fragment-google-ads-xhtml/src/main/java/org/apache/magma/web/google/ads/EmptyAdsTemplate.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-google-ads-xhtml/src/main/java/org/apache/magma/web/google/ads/EmptyAdsTemplate.java?rev=760614&view=auto
==============================================================================
--- labs/magma/trunk/fragment-google-ads-xhtml/src/main/java/org/apache/magma/web/google/ads/EmptyAdsTemplate.java (added)
+++ labs/magma/trunk/fragment-google-ads-xhtml/src/main/java/org/apache/magma/web/google/ads/EmptyAdsTemplate.java Tue Mar 31 20:55:00 2009
@@ -0,0 +1,13 @@
+package org.apache.magma.web.google.ads;
+
+import org.apache.magma.website.templating.Template;
+
+public class EmptyAdsTemplate extends Template {
+
+ public EmptyAdsTemplate() {
+ super();
+ fileName = "emptyAdsTemplate.html";
+ }
+
+
+}
Added: labs/magma/trunk/fragment-google-ads-xhtml/src/main/java/org/apache/magma/web/google/ads/InterceptAds.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-google-ads-xhtml/src/main/java/org/apache/magma/web/google/ads/InterceptAds.aj?rev=760614&view=auto
==============================================================================
--- labs/magma/trunk/fragment-google-ads-xhtml/src/main/java/org/apache/magma/web/google/ads/InterceptAds.aj (added)
+++ labs/magma/trunk/fragment-google-ads-xhtml/src/main/java/org/apache/magma/web/google/ads/InterceptAds.aj Tue Mar 31 20:55:00 2009
@@ -0,0 +1,48 @@
+package org.apache.magma.web.google.ads;
+
+import org.apache.magma.website.HtmlProducer;
+import org.apache.magma.website.velocity.VelocityHtmlProducer;
+
+public privileged aspect InterceptAds {
+
+ HtmlProducer around(GoogleAdsense ad) :
+ execution(public HtmlProducer GoogleAdsWebHandler.doGoogleAds(GoogleAdsense)) &&
+ !cflow(execution(public HtmlProducer GoogleAdsWebHandler.doXhtmlInnerGoogleAds(String))) &&
+ args(ad) {
+
+ return new VelocityHtmlProducer("xhtmlGoogleAdsInclude").addParameter("ad", ad);
+
+ }
+
+ public String GoogleAdsense.toParams() {
+ return google_ad_slot + "__" +
+ google_ad_channel + "__" +
+ google_ad_format + "__" +
+ google_ad_height + "__" +
+ google_ad_width + "__" +
+ google_ad_type;
+ }
+
+ public void GoogleAdsense.fromParams(String params) {
+ String[] split = params.split("__");
+ for (int i = 0; i < split.length; i++) {
+ if (split[i].equals("null")) split[i] = null;
+ }
+ google_ad_slot = split[0];
+ google_ad_channel = split[1];
+ google_ad_format = split[2];
+ google_ad_height = split[3];
+ google_ad_width = split[4];
+ google_ad_type = split[5];
+ }
+
+
+ public HtmlProducer GoogleAdsWebHandler.doXhtmlInnerGoogleAds(String vals) {
+ GoogleAdsense ad = new GoogleAdsense();
+ ad.fromParams(vals);
+ HtmlProducer ret = doGoogleAds(ad);
+ ret.setTemplate(new EmptyAdsTemplate());
+ return ret;
+ }
+
+}
Added: labs/magma/trunk/fragment-google-ads-xhtml/src/main/resources/org/apache/magma/web/google/ads/emptyAdsTemplate.html
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-google-ads-xhtml/src/main/resources/org/apache/magma/web/google/ads/emptyAdsTemplate.html?rev=760614&view=auto
==============================================================================
--- labs/magma/trunk/fragment-google-ads-xhtml/src/main/resources/org/apache/magma/web/google/ads/emptyAdsTemplate.html (added)
+++ labs/magma/trunk/fragment-google-ads-xhtml/src/main/resources/org/apache/magma/web/google/ads/emptyAdsTemplate.html Tue Mar 31 20:55:00 2009
@@ -0,0 +1,26 @@
+
+<html lang="en">
+ <head>
+ <title>Ads</title>
+ <style type="text/css">
+ body {
+ margin: 0;
+ padding: 0;
+ border: 0px none;
+ }
+ html {
+ margin: 0;
+ overflow:auto;
+ border: 0px none;
+ }
+ #zoneMain {
+ margin: 0;
+ padding: 0;
+ border: 0px none;
+ }
+ </style>
+ </head>
+ <body>
+ <div id="zoneMain"></div>
+ </body>
+</html>
\ No newline at end of file
Added: labs/magma/trunk/fragment-google-ads-xhtml/src/main/resources/org/apache/magma/web/google/ads/xhtmlGoogleAdsInclude-head.vm
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-google-ads-xhtml/src/main/resources/org/apache/magma/web/google/ads/xhtmlGoogleAdsInclude-head.vm?rev=760614&view=auto
==============================================================================
--- labs/magma/trunk/fragment-google-ads-xhtml/src/main/resources/org/apache/magma/web/google/ads/xhtmlGoogleAdsInclude-head.vm (added)
+++ labs/magma/trunk/fragment-google-ads-xhtml/src/main/resources/org/apache/magma/web/google/ads/xhtmlGoogleAdsInclude-head.vm Tue Mar 31 20:55:00 2009
@@ -0,0 +1,9 @@
+<style type="text/css">
+#MagmaGoogleAds-${ad.getGoogle_ad_width()}-${ad.getGoogle_ad_height()} {
+ width: ${ad.getGoogle_ad_width()}px;
+ height: ${ad.getGoogle_ad_height()}px;
+ overflow: hidden;
+ border: 0px none;
+
+}
+</style>
\ No newline at end of file
Added: labs/magma/trunk/fragment-google-ads-xhtml/src/main/resources/org/apache/magma/web/google/ads/xhtmlGoogleAdsInclude.vm
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-google-ads-xhtml/src/main/resources/org/apache/magma/web/google/ads/xhtmlGoogleAdsInclude.vm?rev=760614&view=auto
==============================================================================
--- labs/magma/trunk/fragment-google-ads-xhtml/src/main/resources/org/apache/magma/web/google/ads/xhtmlGoogleAdsInclude.vm (added)
+++ labs/magma/trunk/fragment-google-ads-xhtml/src/main/resources/org/apache/magma/web/google/ads/xhtmlGoogleAdsInclude.vm Tue Mar 31 20:55:00 2009
@@ -0,0 +1 @@
+<object class="MagmaGoogleAdsObject" id="MagmaGoogleAds-${ad.getGoogle_ad_width()}-${ad.getGoogle_ad_height()}" data="xhtmlInnerGoogleAds-$ad.toParams()" type="text/html"></object>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org