labs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simo...@apache.org
Subject svn commit: r796110 - in /labs/magma/trunk: fragment-content-main-web/src/main/java/org/apache/magma/web/content/ fragment-content-order-domain/src/main/java/org/apache/magma/domain/content/ fragment-content-order-web/src/main/java/org/apache/magma/web...
Date Tue, 21 Jul 2009 01:38:29 GMT
Author: simoneg
Date: Tue Jul 21 01:38:28 2009
New Revision: 796110

URL: http://svn.apache.org/viewvc?rev=796110&view=rev
Log:
LABS-393 : missing Apache headers

Modified:
    labs/magma/trunk/fragment-content-main-web/src/main/java/org/apache/magma/web/content/AddMainContentToContentWebHandler.aj
    labs/magma/trunk/fragment-content-order-domain/src/main/java/org/apache/magma/domain/content/AddOrder.aj
    labs/magma/trunk/fragment-content-order-web/src/main/java/org/apache/magma/web/content/AddOrderedMethodsToContentWebHandler.aj
    labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/ContentWebHandler.java
    labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/CrudContent.java
    labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/CrudContentCategory.java
    labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/CrudContentImage.java
    labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/InstallContentAdminCruds.aj
    labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/InstallContentWebHandlerIntoRoot.aj
    labs/magma/trunk/fragment-google-ads/pom.xml
    labs/magma/trunk/fragment-google-ads/src/main/java/org/apache/magma/web/google/ads/AddGoogleAdSenseIntoRoot.aj
    labs/magma/trunk/fragment-google-ads/src/main/java/org/apache/magma/web/google/ads/GoogleAdsWebHandler.java
    labs/magma/trunk/fragment-google-ads/src/main/java/org/apache/magma/web/google/ads/GoogleAdsense.java
    labs/magma/trunk/fragment-google-ads/src/main/resources/org/apache/magma/web/google/ads/fooAds.css

Modified: labs/magma/trunk/fragment-content-main-web/src/main/java/org/apache/magma/web/content/AddMainContentToContentWebHandler.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-content-main-web/src/main/java/org/apache/magma/web/content/AddMainContentToContentWebHandler.aj?rev=796110&r1=796109&r2=796110&view=diff
==============================================================================
--- labs/magma/trunk/fragment-content-main-web/src/main/java/org/apache/magma/web/content/AddMainContentToContentWebHandler.aj (original)
+++ labs/magma/trunk/fragment-content-main-web/src/main/java/org/apache/magma/web/content/AddMainContentToContentWebHandler.aj Tue Jul 21 01:38:28 2009
@@ -1,16 +1,32 @@
-package org.apache.magma.web.content;
-
-import org.apache.magma.website.HtmlProducer;
-import org.apache.magma.website.producers.TemplatingProducer;
-import org.apache.magma.website.velocity.VelocityHtmlProducer;
-import org.apache.magma.domain.content.Content;
-import org.apache.magma.domain.content.ContentCategory;
-
-public aspect AddMainContentToContentWebHandler {
-	public HtmlProducer ContentWebHandler.doMainContent(ContentCategory category){
-		if(category == null || category.getMainContent() == null) return null;
-		Content mainContent = category.getMainContent();
-		HtmlProducer main = new TemplatingProducer().addParameter("main", mainContent);
-		return main;
-	}
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.magma.web.content;
+
+import org.apache.magma.website.HtmlProducer;
+import org.apache.magma.website.producers.TemplatingProducer;
+import org.apache.magma.website.velocity.VelocityHtmlProducer;
+import org.apache.magma.domain.content.Content;
+import org.apache.magma.domain.content.ContentCategory;
+
+public aspect AddMainContentToContentWebHandler {
+	public HtmlProducer ContentWebHandler.doMainContent(ContentCategory category){
+		if(category == null || category.getMainContent() == null) return null;
+		Content mainContent = category.getMainContent();
+		HtmlProducer main = new TemplatingProducer().addParameter("main", mainContent);
+		return main;
+	}
+}

Modified: labs/magma/trunk/fragment-content-order-domain/src/main/java/org/apache/magma/domain/content/AddOrder.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-content-order-domain/src/main/java/org/apache/magma/domain/content/AddOrder.aj?rev=796110&r1=796109&r2=796110&view=diff
==============================================================================
--- labs/magma/trunk/fragment-content-order-domain/src/main/java/org/apache/magma/domain/content/AddOrder.aj (original)
+++ labs/magma/trunk/fragment-content-order-domain/src/main/java/org/apache/magma/domain/content/AddOrder.aj Tue Jul 21 01:38:28 2009
@@ -1,34 +1,50 @@
-package org.apache.magma.domain.content;
-
-import javax.persistence.Column;
-
-import org.apache.magma.domain.content.Content;
-import org.apache.magma.domain.content.ContentImage;
-import org.apache.magma.view.Listed;
-import org.apache.magma.view.View;
-
-public aspect AddOrder {
-	private double Content.position;
-	private double ContentImage.position;
-	
-	@View
-	@Listed
-	@Column
-	public double Content.getPosition() {
-		return this.position;
-	}
-	public void Content.setPosition(double position){
-		this.position = position;
-	}
-	
-	@View
-	@Listed
-	@Column
-	public double ContentImage.getPosition() {
-		return this.position;
-	}
-	public void ContentImage.setPosition(double position){
-		this.position = position;
-	}
-	
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.magma.domain.content;
+
+import javax.persistence.Column;
+
+import org.apache.magma.domain.content.Content;
+import org.apache.magma.domain.content.ContentImage;
+import org.apache.magma.view.Listed;
+import org.apache.magma.view.View;
+
+public aspect AddOrder {
+	private double Content.position;
+	private double ContentImage.position;
+	
+	@View
+	@Listed
+	@Column
+	public double Content.getPosition() {
+		return this.position;
+	}
+	public void Content.setPosition(double position){
+		this.position = position;
+	}
+	
+	@View
+	@Listed
+	@Column
+	public double ContentImage.getPosition() {
+		return this.position;
+	}
+	public void ContentImage.setPosition(double position){
+		this.position = position;
+	}
+	
+}

Modified: labs/magma/trunk/fragment-content-order-web/src/main/java/org/apache/magma/web/content/AddOrderedMethodsToContentWebHandler.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-content-order-web/src/main/java/org/apache/magma/web/content/AddOrderedMethodsToContentWebHandler.aj?rev=796110&r1=796109&r2=796110&view=diff
==============================================================================
--- labs/magma/trunk/fragment-content-order-web/src/main/java/org/apache/magma/web/content/AddOrderedMethodsToContentWebHandler.aj (original)
+++ labs/magma/trunk/fragment-content-order-web/src/main/java/org/apache/magma/web/content/AddOrderedMethodsToContentWebHandler.aj Tue Jul 21 01:38:28 2009
@@ -1,25 +1,41 @@
-package org.apache.magma.web.content;
-
-import java.util.List;
-
-import org.apache.magma.basics.LocalizableString;
-import org.apache.magma.database.Database;
-import org.apache.magma.domain.content.Content;
-import org.apache.magma.domain.content.ContentCategory;
-import org.apache.magma.website.HtmlProducer;
-import org.apache.magma.website.beansview.SmartList;
-import org.apache.magma.website.velocity.VelocityHtmlProducer;
-
-public aspect AddOrderedMethodsToContentWebHandler {
-	public SmartList ContentWebHandler.handleOrderedList(ContentCategory category) {
-		if(category == null) return null;
-		HtmlProducer header = new VelocityHtmlProducer("listHeader").addParameter(new LocalizableString("List All " + category.getName()).toString());		
-		SmartList sl = new SmartList(Content.class, "where x.category=?1", category).setFilter(listAll);
-		sl.addSortable("order");
-		sl.addSortable("date").addSortable("title");
-		sl.setSortingField("date", false);
-		sl.setHeader(header);
-		sl.setLink("doShow");
-		return sl;
-	}
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.magma.web.content;
+
+import java.util.List;
+
+import org.apache.magma.basics.LocalizableString;
+import org.apache.magma.database.Database;
+import org.apache.magma.domain.content.Content;
+import org.apache.magma.domain.content.ContentCategory;
+import org.apache.magma.website.HtmlProducer;
+import org.apache.magma.website.beansview.SmartList;
+import org.apache.magma.website.velocity.VelocityHtmlProducer;
+
+public aspect AddOrderedMethodsToContentWebHandler {
+	public SmartList ContentWebHandler.handleOrderedList(ContentCategory category) {
+		if(category == null) return null;
+		HtmlProducer header = new VelocityHtmlProducer("listHeader").addParameter(new LocalizableString("List All " + category.getName()).toString());		
+		SmartList sl = new SmartList(Content.class, "where x.category=?1", category).setFilter(listAll);
+		sl.addSortable("order");
+		sl.addSortable("date").addSortable("title");
+		sl.setSortingField("date", false);
+		sl.setHeader(header);
+		sl.setLink("doShow");
+		return sl;
+	}
+}

Modified: labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/ContentWebHandler.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/ContentWebHandler.java?rev=796110&r1=796109&r2=796110&view=diff
==============================================================================
--- labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/ContentWebHandler.java (original)
+++ labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/ContentWebHandler.java Tue Jul 21 01:38:28 2009
@@ -1,97 +1,113 @@
-package org.apache.magma.web.content;
-
-
-import java.util.List;
-
-import org.apache.magma.basics.LocalizableString;
-import org.apache.magma.database.Database;
-import org.apache.magma.domain.content.Content;
-import org.apache.magma.domain.content.ContentCategory;
-import org.apache.magma.domain.content.ContentImage;
-import org.apache.magma.view.tree.SimpleViewFilter;
-import org.apache.magma.view.tree.ViewCustomizer;
-import org.apache.magma.website.HtmlProducer;
-import org.apache.magma.website.Producer;
-import org.apache.magma.website.StreamProducer;
-import org.apache.magma.website.WebHandler;
-import org.apache.magma.website.beansview.SmartList;
-import org.apache.magma.website.producers.TemplatingProducer;
-
-public class ContentWebHandler extends WebHandler{
-protected ViewCustomizer listAll = new SimpleViewFilter("-category");
-	
-	public HtmlProducer doLastBoxWithDate(int limit, ContentCategory category){
-		if (category == null) return null;
-		List<Content> query = new Database().query(Content.class, 0, limit, "where x.category=?1 order by x.date desc", category);
-		HtmlProducer box = new TemplatingProducer()
-			.addParameter("query", query)
-			.addParameter("title", new LocalizableString(category.getName()).toString());
-		return box; 
-	}
-
-	public HtmlProducer doLastBox(int limit, ContentCategory category){
-		if (category == null) return null;
-		List<Content> query = new Database().query(Content.class, 0, limit, "where x.category=?1 order by x.date desc", category);
-		HtmlProducer box = new TemplatingProducer()
-			.addParameter("query", query)
-			.addParameter("title", new LocalizableString(category.getName()).toString());
-		return box; 
-	}
-	
-	public HtmlProducer doContentBox(ContentCategory category){
-		if (category == null) return null;
-		List<Content> query = new Database().query(Content.class, "where x.category=?1 order by x.date desc", category);
-		HtmlProducer box = new TemplatingProducer()
-			.addParameter("query", query)
-			.addParameter("title", new LocalizableString(category.getName()).toString());
-		return box; 
-	}
-	
-	public HtmlProducer doShow(Content content){
-		return  new TemplatingProducer("content").addParameter(content);
-	}
-
-	public HtmlProducer doShowLast(ContentCategory category){
-		if (category == null) return null;
-		List<Content> query = new Database().query(Content.class, 0, 1, "where x.category=?1 order by x.date desc", category);
-		Content content = null;
-		if (query.size() > 0) content = query.get(0);
-		return new TemplatingProducer("lastcontent")
-			.addParameter("content",content);
-	}
-	
-	public HtmlProducer doShowLastElement(ContentCategory category){
-		if (category == null) return null;
-		List<Content> query = new Database().query(Content.class, 0, 1, "where x.category=?1 order by x.date desc", category);
-		Content content = null;
-		if (query.size() > 0) content = query.get(0);
-		return new TemplatingProducer("lastelement")
-			.addParameter("title", new LocalizableString(category.getName()).toString())
-			.addParameter("content",content);
-	}
-	
-	public HtmlProducer doImageBox(ContentCategory category){
-		if(category == null) return null;
-		List<ContentImage> query = new Database().query(ContentImage.class, 0, 1,"where x.category=?1 order by x.date desc" , category);
-		ContentImage pic = null;
-		if(query.size()>0) pic = query.get(0);
-		HtmlProducer imgDiv = new TemplatingProducer("image").addParameter(pic); 	
-		return imgDiv;
-	}
-	
-	public Producer doDownload(ContentImage pic) {
-		return new StreamProducer(pic.getTitle(), pic.getImage());
-	}
-	
-	public SmartList handleListAll(ContentCategory c) {
-		HtmlProducer header = new TemplatingProducer("listHeader").addParameter(new LocalizableString("List All " + c.getName()).toString());		
-		SmartList sl = new SmartList(Content.class, "where x.category=?1", c).setFilter(listAll);
-		sl.addSortable("date").addSortable("title");
-		sl.setSortingField("date", false);
-		sl.setHeader(header);
-		sl.setLink("doShow");
-		return sl;
-	}
-	
-	
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.magma.web.content;
+
+
+import java.util.List;
+
+import org.apache.magma.basics.LocalizableString;
+import org.apache.magma.database.Database;
+import org.apache.magma.domain.content.Content;
+import org.apache.magma.domain.content.ContentCategory;
+import org.apache.magma.domain.content.ContentImage;
+import org.apache.magma.view.tree.SimpleViewFilter;
+import org.apache.magma.view.tree.ViewCustomizer;
+import org.apache.magma.website.HtmlProducer;
+import org.apache.magma.website.Producer;
+import org.apache.magma.website.StreamProducer;
+import org.apache.magma.website.WebHandler;
+import org.apache.magma.website.beansview.SmartList;
+import org.apache.magma.website.producers.TemplatingProducer;
+
+public class ContentWebHandler extends WebHandler{
+protected ViewCustomizer listAll = new SimpleViewFilter("-category");
+	
+	public HtmlProducer doLastBoxWithDate(int limit, ContentCategory category){
+		if (category == null) return null;
+		List<Content> query = new Database().query(Content.class, 0, limit, "where x.category=?1 order by x.date desc", category);
+		HtmlProducer box = new TemplatingProducer()
+			.addParameter("query", query)
+			.addParameter("title", new LocalizableString(category.getName()).toString());
+		return box; 
+	}
+
+	public HtmlProducer doLastBox(int limit, ContentCategory category){
+		if (category == null) return null;
+		List<Content> query = new Database().query(Content.class, 0, limit, "where x.category=?1 order by x.date desc", category);
+		HtmlProducer box = new TemplatingProducer()
+			.addParameter("query", query)
+			.addParameter("title", new LocalizableString(category.getName()).toString());
+		return box; 
+	}
+	
+	public HtmlProducer doContentBox(ContentCategory category){
+		if (category == null) return null;
+		List<Content> query = new Database().query(Content.class, "where x.category=?1 order by x.date desc", category);
+		HtmlProducer box = new TemplatingProducer()
+			.addParameter("query", query)
+			.addParameter("title", new LocalizableString(category.getName()).toString());
+		return box; 
+	}
+	
+	public HtmlProducer doShow(Content content){
+		return  new TemplatingProducer("content").addParameter(content);
+	}
+
+	public HtmlProducer doShowLast(ContentCategory category){
+		if (category == null) return null;
+		List<Content> query = new Database().query(Content.class, 0, 1, "where x.category=?1 order by x.date desc", category);
+		Content content = null;
+		if (query.size() > 0) content = query.get(0);
+		return new TemplatingProducer("lastcontent")
+			.addParameter("content",content);
+	}
+	
+	public HtmlProducer doShowLastElement(ContentCategory category){
+		if (category == null) return null;
+		List<Content> query = new Database().query(Content.class, 0, 1, "where x.category=?1 order by x.date desc", category);
+		Content content = null;
+		if (query.size() > 0) content = query.get(0);
+		return new TemplatingProducer("lastelement")
+			.addParameter("title", new LocalizableString(category.getName()).toString())
+			.addParameter("content",content);
+	}
+	
+	public HtmlProducer doImageBox(ContentCategory category){
+		if(category == null) return null;
+		List<ContentImage> query = new Database().query(ContentImage.class, 0, 1,"where x.category=?1 order by x.date desc" , category);
+		ContentImage pic = null;
+		if(query.size()>0) pic = query.get(0);
+		HtmlProducer imgDiv = new TemplatingProducer("image").addParameter(pic); 	
+		return imgDiv;
+	}
+	
+	public Producer doDownload(ContentImage pic) {
+		return new StreamProducer(pic.getTitle(), pic.getImage());
+	}
+	
+	public SmartList handleListAll(ContentCategory c) {
+		HtmlProducer header = new TemplatingProducer("listHeader").addParameter(new LocalizableString("List All " + c.getName()).toString());		
+		SmartList sl = new SmartList(Content.class, "where x.category=?1", c).setFilter(listAll);
+		sl.addSortable("date").addSortable("title");
+		sl.setSortingField("date", false);
+		sl.setHeader(header);
+		sl.setLink("doShow");
+		return sl;
+	}
+	
+	
+}

Modified: labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/CrudContent.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/CrudContent.java?rev=796110&r1=796109&r2=796110&view=diff
==============================================================================
--- labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/CrudContent.java (original)
+++ labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/CrudContent.java Tue Jul 21 01:38:28 2009
@@ -1,18 +1,34 @@
-package org.apache.magma.web.content;
-
-
-
-import org.apache.magma.domain.content.Content;
-import org.apache.magma.website.admin.CompleteCrudHandler;
-import org.apache.magma.website.beansview.SmartForm;
-
-public class CrudContent extends CompleteCrudHandler<Content>{
-	public CrudContent(){
-		super(Content.class);
-	}
-	@Override
-	public SmartForm handleEdit(Content bean) {
-		//bean.setDate(new Date());
-		return super.handleEdit(bean);
-	}
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.magma.web.content;
+
+
+
+import org.apache.magma.domain.content.Content;
+import org.apache.magma.website.admin.CompleteCrudHandler;
+import org.apache.magma.website.beansview.SmartForm;
+
+public class CrudContent extends CompleteCrudHandler<Content>{
+	public CrudContent(){
+		super(Content.class);
+	}
+	@Override
+	public SmartForm handleEdit(Content bean) {
+		//bean.setDate(new Date());
+		return super.handleEdit(bean);
+	}
+}

Modified: labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/CrudContentCategory.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/CrudContentCategory.java?rev=796110&r1=796109&r2=796110&view=diff
==============================================================================
--- labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/CrudContentCategory.java (original)
+++ labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/CrudContentCategory.java Tue Jul 21 01:38:28 2009
@@ -1,12 +1,28 @@
-package org.apache.magma.web.content;
-
-
-
-import org.apache.magma.domain.content.ContentCategory;
-import org.apache.magma.website.admin.CompleteCrudHandler;
-
-public class CrudContentCategory extends CompleteCrudHandler<ContentCategory>{
-	public CrudContentCategory(){
-		super(ContentCategory.class);
-	}
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.magma.web.content;
+
+
+
+import org.apache.magma.domain.content.ContentCategory;
+import org.apache.magma.website.admin.CompleteCrudHandler;
+
+public class CrudContentCategory extends CompleteCrudHandler<ContentCategory>{
+	public CrudContentCategory(){
+		super(ContentCategory.class);
+	}
+}

Modified: labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/CrudContentImage.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/CrudContentImage.java?rev=796110&r1=796109&r2=796110&view=diff
==============================================================================
--- labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/CrudContentImage.java (original)
+++ labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/CrudContentImage.java Tue Jul 21 01:38:28 2009
@@ -1,48 +1,64 @@
-package org.apache.magma.web.content;
-
-
-
-import java.io.IOException;
-
-import org.apache.commons.fileupload.FileItem;
-import org.apache.magma.basics.LocalizableString;
-import org.apache.magma.database.Database;
-import org.apache.magma.domain.content.ContentImage;
-import org.apache.magma.website.CompoundType;
-import org.apache.magma.website.HtmlProducer;
-import org.apache.magma.website.admin.CompleteCrudHandler;
-import org.apache.magma.website.producers.TemplatingProducer;
-
-public class CrudContentImage extends CompleteCrudHandler<ContentImage>{
-	public CrudContentImage(){
-		super(ContentImage.class);
-	}
-	private FileItem paramFile;
-	
-
-	public void setParamFile(FileItem paramFile) {
-		this.paramFile = paramFile;
-	}
-	@Override
-	public HtmlProducer doShow(ContentImage pic){
-		HtmlProducer footer = new TemplatingProducer("displaybanner").addParameter("bean", pic);
-		return (HtmlProducer) super.doShow(pic).compoundWith(footer, CompoundType.AFTER);
-	}
-	public HtmlProducer doSelectImage(ContentImage pic) throws IOException {
-		String message = "";
-		if (paramFile != null) {
-			if (paramFile != null && paramFile.getSize() > 0) {
-				pic.setImage(paramFile.getInputStream());
-				pic.setUploadedImage(true);
-			}
-			new Database().save(pic);
-			if (paramFile != null) {
-				message = new LocalizableString("File {0} saved correctly", paramFile.getName()).toString();
-			}
-		} else {
-			message = new LocalizableString("Select a file").toString();
-		}
-		return new TemplatingProducer("pic").addParameter("message", message).addParameter("bean", pic);
-	}
-	
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.magma.web.content;
+
+
+
+import java.io.IOException;
+
+import org.apache.commons.fileupload.FileItem;
+import org.apache.magma.basics.LocalizableString;
+import org.apache.magma.database.Database;
+import org.apache.magma.domain.content.ContentImage;
+import org.apache.magma.website.CompoundType;
+import org.apache.magma.website.HtmlProducer;
+import org.apache.magma.website.admin.CompleteCrudHandler;
+import org.apache.magma.website.producers.TemplatingProducer;
+
+public class CrudContentImage extends CompleteCrudHandler<ContentImage>{
+	public CrudContentImage(){
+		super(ContentImage.class);
+	}
+	private FileItem paramFile;
+	
+
+	public void setParamFile(FileItem paramFile) {
+		this.paramFile = paramFile;
+	}
+	@Override
+	public HtmlProducer doShow(ContentImage pic){
+		HtmlProducer footer = new TemplatingProducer("displaybanner").addParameter("bean", pic);
+		return (HtmlProducer) super.doShow(pic).compoundWith(footer, CompoundType.AFTER);
+	}
+	public HtmlProducer doSelectImage(ContentImage pic) throws IOException {
+		String message = "";
+		if (paramFile != null) {
+			if (paramFile != null && paramFile.getSize() > 0) {
+				pic.setImage(paramFile.getInputStream());
+				pic.setUploadedImage(true);
+			}
+			new Database().save(pic);
+			if (paramFile != null) {
+				message = new LocalizableString("File {0} saved correctly", paramFile.getName()).toString();
+			}
+		} else {
+			message = new LocalizableString("Select a file").toString();
+		}
+		return new TemplatingProducer("pic").addParameter("message", message).addParameter("bean", pic);
+	}
+	
+}

Modified: labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/InstallContentAdminCruds.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/InstallContentAdminCruds.aj?rev=796110&r1=796109&r2=796110&view=diff
==============================================================================
--- labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/InstallContentAdminCruds.aj (original)
+++ labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/InstallContentAdminCruds.aj Tue Jul 21 01:38:28 2009
@@ -1,26 +1,42 @@
-package org.apache.magma.web.content;
-
-import org.apache.magma.domain.content.Content;
-import org.apache.magma.domain.content.ContentCategory;
-import org.apache.magma.domain.content.ContentImage;
-
-import org.apache.magma.website.admin.Manages;
-import org.apache.magma.website.admin.AdminWebHandler;
-
-public aspect InstallContentAdminCruds {
-	@Manages(Content.class)
-	public CrudContent AdminWebHandler.handleContent() {
-		return new CrudContent();
-	}
-	
-	@Manages(ContentCategory.class)
-	public CrudContentCategory AdminWebHandler.handleContentCategory() {
-		return new CrudContentCategory();
-	}
-	
-	@Manages(ContentImage.class)
-	public CrudContentImage AdminWebHandler.handleContentImage() {
-		return new CrudContentImage();
-	}
-	
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.magma.web.content;
+
+import org.apache.magma.domain.content.Content;
+import org.apache.magma.domain.content.ContentCategory;
+import org.apache.magma.domain.content.ContentImage;
+
+import org.apache.magma.website.admin.Manages;
+import org.apache.magma.website.admin.AdminWebHandler;
+
+public aspect InstallContentAdminCruds {
+	@Manages(Content.class)
+	public CrudContent AdminWebHandler.handleContent() {
+		return new CrudContent();
+	}
+	
+	@Manages(ContentCategory.class)
+	public CrudContentCategory AdminWebHandler.handleContentCategory() {
+		return new CrudContentCategory();
+	}
+	
+	@Manages(ContentImage.class)
+	public CrudContentImage AdminWebHandler.handleContentImage() {
+		return new CrudContentImage();
+	}
+	
+}

Modified: labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/InstallContentWebHandlerIntoRoot.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/InstallContentWebHandlerIntoRoot.aj?rev=796110&r1=796109&r2=796110&view=diff
==============================================================================
--- labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/InstallContentWebHandlerIntoRoot.aj (original)
+++ labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/InstallContentWebHandlerIntoRoot.aj Tue Jul 21 01:38:28 2009
@@ -1,9 +1,25 @@
-package org.apache.magma.web.content;
-
-import org.apache.magma.website.RootWebHandler;
-
-public aspect InstallContentWebHandlerIntoRoot {
-	public ContentWebHandler RootWebHandler.handleContent() {
-		return new ContentWebHandler();
-	}
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.magma.web.content;
+
+import org.apache.magma.website.RootWebHandler;
+
+public aspect InstallContentWebHandlerIntoRoot {
+	public ContentWebHandler RootWebHandler.handleContent() {
+		return new ContentWebHandler();
+	}
+}

Modified: labs/magma/trunk/fragment-google-ads/pom.xml
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-google-ads/pom.xml?rev=796110&r1=796109&r2=796110&view=diff
==============================================================================
--- labs/magma/trunk/fragment-google-ads/pom.xml (original)
+++ labs/magma/trunk/fragment-google-ads/pom.xml Tue Jul 21 01:38:28 2009
@@ -1,27 +1,43 @@
-<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">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.magma</groupId>
-		<artifactId>magma-parent</artifactId>
-		<version>2</version>
-	</parent>	
-	<groupId>org.apache.magma</groupId>
-	<artifactId>fragment-google-ads</artifactId>
-	<version>0.0.2-SNAPSHOT</version>
-	<name>Google Adsense Fragment</name>
-	<packaging>magma</packaging> 
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.magma</groupId>
-			<artifactId>foundation-website</artifactId>
-			<version>0.0.2-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.magma</groupId>
-			<artifactId>website-velocity</artifactId>
-			<version>0.0.2-SNAPSHOT</version>
-		</dependency>
-	</dependencies>  
-</project>
+<!-- 
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<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">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.apache.magma</groupId>
+		<artifactId>magma-parent</artifactId>
+		<version>2</version>
+	</parent>	
+	<groupId>org.apache.magma</groupId>
+	<artifactId>fragment-google-ads</artifactId>
+	<version>0.0.2-SNAPSHOT</version>
+	<name>Google Adsense Fragment</name>
+	<packaging>magma</packaging> 
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.magma</groupId>
+			<artifactId>foundation-website</artifactId>
+			<version>0.0.2-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.magma</groupId>
+			<artifactId>website-velocity</artifactId>
+			<version>0.0.2-SNAPSHOT</version>
+		</dependency>
+	</dependencies>  
+</project>

Modified: labs/magma/trunk/fragment-google-ads/src/main/java/org/apache/magma/web/google/ads/AddGoogleAdSenseIntoRoot.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-google-ads/src/main/java/org/apache/magma/web/google/ads/AddGoogleAdSenseIntoRoot.aj?rev=796110&r1=796109&r2=796110&view=diff
==============================================================================
--- labs/magma/trunk/fragment-google-ads/src/main/java/org/apache/magma/web/google/ads/AddGoogleAdSenseIntoRoot.aj (original)
+++ labs/magma/trunk/fragment-google-ads/src/main/java/org/apache/magma/web/google/ads/AddGoogleAdSenseIntoRoot.aj Tue Jul 21 01:38:28 2009
@@ -1,11 +1,27 @@
-package org.apache.magma.web.google.ads;
-
-import org.apache.magma.website.RootWebHandler;
-
-
-public aspect AddGoogleAdSenseIntoRoot {
-	public GoogleAdsWebHandler RootWebHandler.handleGoogleAds() {
-		return new GoogleAdsWebHandler();
-	}
-	
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.magma.web.google.ads;
+
+import org.apache.magma.website.RootWebHandler;
+
+
+public aspect AddGoogleAdSenseIntoRoot {
+	public GoogleAdsWebHandler RootWebHandler.handleGoogleAds() {
+		return new GoogleAdsWebHandler();
+	}
+	
+}

Modified: labs/magma/trunk/fragment-google-ads/src/main/java/org/apache/magma/web/google/ads/GoogleAdsWebHandler.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-google-ads/src/main/java/org/apache/magma/web/google/ads/GoogleAdsWebHandler.java?rev=796110&r1=796109&r2=796110&view=diff
==============================================================================
--- labs/magma/trunk/fragment-google-ads/src/main/java/org/apache/magma/web/google/ads/GoogleAdsWebHandler.java (original)
+++ labs/magma/trunk/fragment-google-ads/src/main/java/org/apache/magma/web/google/ads/GoogleAdsWebHandler.java Tue Jul 21 01:38:28 2009
@@ -1,18 +1,34 @@
-package org.apache.magma.web.google.ads;
-
-import org.apache.magma.settings.Settings;
-import org.apache.magma.website.HtmlProducer;
-import org.apache.magma.website.WebHandler;
-import org.apache.magma.website.velocity.VelocityHtmlProducer;
-
-public class GoogleAdsWebHandler extends WebHandler{
-	public HtmlProducer doGoogleAds(GoogleAdsense ad){
-		String key = Settings.get("google.adsense.client");
-		if (Settings.isDeveloperEnv()){
-			return new VelocityHtmlProducer("googleAdsDeveloper").addParameter("ad", ad);
-		} else {
-			String adCode = ad.toJavascript();
-			return new VelocityHtmlProducer("googleAdsense").addParameter("key", key).addParameter("adCode", adCode);
-		}
-	}
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.magma.web.google.ads;
+
+import org.apache.magma.settings.Settings;
+import org.apache.magma.website.HtmlProducer;
+import org.apache.magma.website.WebHandler;
+import org.apache.magma.website.velocity.VelocityHtmlProducer;
+
+public class GoogleAdsWebHandler extends WebHandler{
+	public HtmlProducer doGoogleAds(GoogleAdsense ad){
+		String key = Settings.get("google.adsense.client");
+		if (Settings.isDeveloperEnv()){
+			return new VelocityHtmlProducer("googleAdsDeveloper").addParameter("ad", ad);
+		} else {
+			String adCode = ad.toJavascript();
+			return new VelocityHtmlProducer("googleAdsense").addParameter("key", key).addParameter("adCode", adCode);
+		}
+	}
+}

Modified: labs/magma/trunk/fragment-google-ads/src/main/java/org/apache/magma/web/google/ads/GoogleAdsense.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-google-ads/src/main/java/org/apache/magma/web/google/ads/GoogleAdsense.java?rev=796110&r1=796109&r2=796110&view=diff
==============================================================================
--- labs/magma/trunk/fragment-google-ads/src/main/java/org/apache/magma/web/google/ads/GoogleAdsense.java (original)
+++ labs/magma/trunk/fragment-google-ads/src/main/java/org/apache/magma/web/google/ads/GoogleAdsense.java Tue Jul 21 01:38:28 2009
@@ -1,55 +1,71 @@
-package org.apache.magma.web.google.ads;
-
-public class GoogleAdsense {
-	private String google_ad_slot;
-	private String google_ad_width;
-	private String google_ad_height;
-	private String google_ad_format;
-	private String google_ad_type;
-	private String google_ad_channel;
-	
-	public GoogleAdsense setGoogle_ad_slot(String google_ad_slot) {
-		this.google_ad_slot = google_ad_slot;
-		return this;
-	}
-	public GoogleAdsense setGoogle_ad_width(String google_ad_width) {
-		this.google_ad_width = google_ad_width;
-		return this;
-	}
-	public GoogleAdsense setGoogle_ad_height(String google_ad_height) {
-		this.google_ad_height = google_ad_height;
-		return this;
-	}
-	public GoogleAdsense setGoogle_ad_format(String google_ad_format) {
-		this.google_ad_format = google_ad_format;
-		return this;
-	}
-	public GoogleAdsense setGoogle_ad_type(String google_ad_type) {
-		this.google_ad_type = google_ad_type;
-		return this;
-	}
-	public GoogleAdsense setGoogle_ad_channel(String google_ad_channel) {
-		this.google_ad_channel = google_ad_channel;
-		return this;
-	}		
-	
-	public String getGoogle_ad_width() {
-		return google_ad_width;
-	}
-	public String getGoogle_ad_height() {
-		return google_ad_height;
-	}
-	
-	public String toJavascript(){
-		StringBuilder sb = new StringBuilder();
-		if(this.google_ad_slot != null) sb.append("google_ad_slot = '").append(this.google_ad_slot).append("';");
-		if(this.google_ad_height != null)sb.append("google_ad_height = '").append(this.google_ad_height).append("';");
-		if(this.google_ad_width != null)sb.append("google_ad_width = '").append(this.google_ad_width).append("';");
-		if(this.google_ad_format != null)sb.append("google_ad_format = '").append(this.google_ad_format).append("';");
-		if(this.google_ad_type != null)sb.append("google_ad_type = '").append(this.google_ad_type).append("';");
-		if(this.google_ad_channel != null)sb.append("google_ad_channel = '").append(this.google_ad_channel).append("';");
-		return sb.toString();
-	}
-	
-	
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.magma.web.google.ads;
+
+public class GoogleAdsense {
+	private String google_ad_slot;
+	private String google_ad_width;
+	private String google_ad_height;
+	private String google_ad_format;
+	private String google_ad_type;
+	private String google_ad_channel;
+	
+	public GoogleAdsense setGoogle_ad_slot(String google_ad_slot) {
+		this.google_ad_slot = google_ad_slot;
+		return this;
+	}
+	public GoogleAdsense setGoogle_ad_width(String google_ad_width) {
+		this.google_ad_width = google_ad_width;
+		return this;
+	}
+	public GoogleAdsense setGoogle_ad_height(String google_ad_height) {
+		this.google_ad_height = google_ad_height;
+		return this;
+	}
+	public GoogleAdsense setGoogle_ad_format(String google_ad_format) {
+		this.google_ad_format = google_ad_format;
+		return this;
+	}
+	public GoogleAdsense setGoogle_ad_type(String google_ad_type) {
+		this.google_ad_type = google_ad_type;
+		return this;
+	}
+	public GoogleAdsense setGoogle_ad_channel(String google_ad_channel) {
+		this.google_ad_channel = google_ad_channel;
+		return this;
+	}		
+	
+	public String getGoogle_ad_width() {
+		return google_ad_width;
+	}
+	public String getGoogle_ad_height() {
+		return google_ad_height;
+	}
+	
+	public String toJavascript(){
+		StringBuilder sb = new StringBuilder();
+		if(this.google_ad_slot != null) sb.append("google_ad_slot = '").append(this.google_ad_slot).append("';");
+		if(this.google_ad_height != null)sb.append("google_ad_height = '").append(this.google_ad_height).append("';");
+		if(this.google_ad_width != null)sb.append("google_ad_width = '").append(this.google_ad_width).append("';");
+		if(this.google_ad_format != null)sb.append("google_ad_format = '").append(this.google_ad_format).append("';");
+		if(this.google_ad_type != null)sb.append("google_ad_type = '").append(this.google_ad_type).append("';");
+		if(this.google_ad_channel != null)sb.append("google_ad_channel = '").append(this.google_ad_channel).append("';");
+		return sb.toString();
+	}
+	
+	
+}

Modified: labs/magma/trunk/fragment-google-ads/src/main/resources/org/apache/magma/web/google/ads/fooAds.css
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-google-ads/src/main/resources/org/apache/magma/web/google/ads/fooAds.css?rev=796110&r1=796109&r2=796110&view=diff
==============================================================================
--- labs/magma/trunk/fragment-google-ads/src/main/resources/org/apache/magma/web/google/ads/fooAds.css (original)
+++ labs/magma/trunk/fragment-google-ads/src/main/resources/org/apache/magma/web/google/ads/fooAds.css Tue Jul 21 01:38:28 2009
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 .fooAds{
 	background-color:yellow;
-}
\ 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


Mime
View raw message