[jboss-svn-commits] JBL Code SVN: r18663 - in labs/jbosslabs/trunk/portal-extensions: configuration and 10 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Mar 3 12:07:32 EST 2008
Author: adamw
Date: 2008-03-03 12:07:31 -0500 (Mon, 03 Mar 2008)
New Revision: 18663
Added:
labs/jbosslabs/trunk/portal-extensions/feeds/
labs/jbosslabs/trunk/portal-extensions/feeds/binaries/
labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/
labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/
labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/deploy/
labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/deploy/blog-dev-ds.xml
labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/deploy/blog.ear
labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/deploy/blog.jar
labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/
labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/ehcache-1.2.3.jar
labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/hibernate-annotations.jar
labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/hibernate-commons-annotations.jar
labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/hibernate-entitymanager.jar
labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/hibernate-search.jar
labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/hibernate-validator.jar
labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/hibernate.jar
labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/hibernate3.jar
labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/htmlcleaner1_6.jar
labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/jdom.jar
labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/jericho-html-2.5.jar
labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/lucene-core.jar
labs/jbosslabs/trunk/portal-extensions/feeds/maven.xml
labs/jbosslabs/trunk/portal-extensions/feeds/project.properties
labs/jbosslabs/trunk/portal-extensions/feeds/project.xml
Removed:
labs/jbosslabs/trunk/portal-extensions/portal-default/forge-portal-default.iml
Modified:
labs/jbosslabs/trunk/portal-extensions/configuration/maven.xml
labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/portal-mysql-ds.xml.sample
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java
labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
Log:
Adding feeds
Modified: labs/jbosslabs/trunk/portal-extensions/configuration/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/maven.xml 2008-03-03 17:04:17 UTC (rev 18662)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/maven.xml 2008-03-03 17:07:31 UTC (rev 18663)
@@ -43,6 +43,12 @@
<j:set var="jar.to.dir" value="${local.deploy.dir}/jbossws.sar" />
<attainGoal name="jar-to-dir" />
</j:if>
- <ant:delete file="${local.deploy.dir}/jbossws.sar/jbossws-context.war" />
+ <ant:delete dir="${local.deploy.dir}/jbossws.sar/jbossws-context.war" />
+
+ <ant:copy todir="${forge.jar.dest}" overwrite="true">
+ <ant:fileset dir="${ext.root.dir}/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/lib">
+ <include name="jgroups.jar" />
+ </ant:fileset>
+ </ant:copy>
</goal>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/portal-mysql-ds.xml.sample
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/portal-mysql-ds.xml.sample 2008-03-03 17:04:17 UTC (rev 18662)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/portal-mysql-ds.xml.sample 2008-03-03 17:07:31 UTC (rev 18663)
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<datasources>
- <local-tx-datasource>
+ <xa-datasource>
<jndi-name>PortalDS</jndi-name>
- <connection-url>jdbc:mysql://localhost:3306/jbossportal?useServerPrepStmts=false</connection-url>
- <driver-class>org.gjt.mm.mysql.Driver</driver-class>
+ <xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class>
+ <xa-datasource-property name="URL">jdbc:mysql://localhost:3306/jbossportal?useServerPrepStmts=false&jdbcCompliantTruncation=false</xa-datasource-property>
<user-name>portal</user-name>
<password>portalpassword</password>
- </local-tx-datasource>
+ <track-connection-by-tx>true</track-connection-by-tx>
+ </xa-datasource>
</datasources>
Property changes on: labs/jbosslabs/trunk/portal-extensions/feeds
___________________________________________________________________
Name: svn:ignore
+ feeds.iml
Added: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/deploy/blog-dev-ds.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/deploy/blog-dev-ds.xml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/deploy/blog-dev-ds.xml 2008-03-03 17:07:31 UTC (rev 18663)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE datasources
+ PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd">
+
+<datasources>
+
+ <local-tx-datasource>
+ <jndi-name>blogDatasource</jndi-name>
+ <connection-url>jdbc:mysql:///blog?useUnicode=true&characterEncoding=UTF-8</connection-url>
+ <driver-class>com.mysql.jdbc.Driver</driver-class>
+ <user-name>root</user-name>
+ <password></password>
+<!--
+ <exception-sorter-class-name>
+ org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter
+ </exception-sorter-class-name>
+ <metadata>
+ <type-mapping>mySQL</type-mapping>
+ </metadata>
+-->
+ </local-tx-datasource>
+
+</datasources>
+
Added: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/deploy/blog.ear
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/deploy/blog.ear
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/deploy/blog.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/deploy/blog.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/ehcache-1.2.3.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/ehcache-1.2.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/hibernate-annotations.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/hibernate-annotations.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/hibernate-commons-annotations.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/hibernate-commons-annotations.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/hibernate-entitymanager.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/hibernate-entitymanager.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/hibernate-search.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/hibernate-search.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/hibernate-validator.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/hibernate-validator.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/hibernate.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/hibernate.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/hibernate3.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/hibernate3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/htmlcleaner1_6.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/htmlcleaner1_6.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/jdom.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/jdom.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/jericho-html-2.5.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/jericho-html-2.5.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/lucene-core.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/feeds/binaries/server/default/lib/lucene-core.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/feeds/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/feeds/maven.xml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/feeds/maven.xml 2008-03-03 17:07:31 UTC (rev 18663)
@@ -0,0 +1,31 @@
+<!--
+ JBoss, the OpenSource J2EE webOS
+ Distributable under LGPL license.
+ See terms of license at gnu.org.
+ -->
+<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
+ <!-- Default war-project goals -->
+
+ <goal name="all">
+ <attainGoal name="prj-all" />
+ </goal>
+
+ <goal name="build">
+
+ </goal>
+
+ <goal name="deploy">
+ <ant:copy todir="${local.server.dir}" overwrite="true">
+ <ant:fileset dir="binaries">
+ <ant:include name="**/*" />
+ </ant:fileset>
+ </ant:copy>
+ </goal>
+
+ <goal name="clean">
+ <ant:delete dir="${local.deploy.dir}/blog.ear" />
+ <ant:delete file="${local.deploy.dir}/blog.jar" />
+ <ant:delete file="${local.deploy.dir}/blog-dev-ds.xml" />
+ <attainGoal name="prj-clean" />
+ </goal>
+</project>
Added: labs/jbosslabs/trunk/portal-extensions/feeds/project.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/feeds/project.properties (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/feeds/project.properties 2008-03-03 17:07:31 UTC (rev 18663)
@@ -0,0 +1,4 @@
+maven.repo.remote=http://repo1.maven.org/maven
+maven.junit.fork=yes
+
+maven.final.name=${pom.artifactId}
\ No newline at end of file
Added: labs/jbosslabs/trunk/portal-extensions/feeds/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/feeds/project.xml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/feeds/project.xml 2008-03-03 17:07:31 UTC (rev 18663)
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+<!--
+ JBoss, the OpenSource J2EE webOS
+ Distributable under LGPL license.
+ See terms of license at gnu.org.
+ -->
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>../common.xml</extend>
+ <id>feeds</id>
+ <name>Feeds</name>
+ <currentVersion>1.0</currentVersion>
+ <organization>
+ <name>Adam Warski</name>
+ <url>http://www.warski.org</url>
+ </organization>
+ <description />
+
+ <dependencies />
+</project>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java 2008-03-03 17:04:17 UTC (rev 18662)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java 2008-03-03 17:07:31 UTC (rev 18663)
@@ -120,6 +120,10 @@
sendRedirect(invocation, "/drools/" + rest);
return null;
+ } else if ("feeds".equals(parser.getFirstToken()) && parser.hasMoreTokens()) {
+ parser.proceed();
+ sendRedirect(invocation, "/blogs/feed/" + parser.getFirstToken() + "?type=atom");
+ return null;
}
// End of redirects.
Deleted: labs/jbosslabs/trunk/portal-extensions/portal-default/forge-portal-default.iml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-default/forge-portal-default.iml 2008-03-03 17:04:17 UTC (rev 18662)
+++ labs/jbosslabs/trunk/portal-extensions/portal-default/forge-portal-default.iml 2008-03-03 17:07:31 UTC (rev 18663)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
- <component name="ModuleRootManager" />
- <component name="NewModuleRootManager" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/target" />
- <exclude-output />
- <content url="file://$MODULE_DIR$" />
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="forge-common" />
- <orderEntry type="library" name="jboss" level="application" />
- <orderEntry type="module" module-name="shotoku-base" />
- <orderEntry type="module" module-name="shotoku-aop" />
- <orderEntryProperties />
- </component>
-</module>
-
Modified: labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2008-03-03 17:04:17 UTC (rev 18662)
+++ labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2008-03-03 17:07:31 UTC (rev 18663)
@@ -99,7 +99,6 @@
<height>4</height>
</window>
-
<window>
<window-name>FreezoneAnnoucementsWindow</window-name>
<instance-ref>
@@ -110,15 +109,6 @@
</window>
<window>
- <window-name>FreezoneLatestReleasesWindow</window-name>
- <instance-ref>
- FreezoneDefaultPageLatestReleasesInstance
- </instance-ref>
- <region>right</region>
- <height>1</height>
- </window>
-
- <window>
<window-name>PodcastPortletWindow</window-name>
<instance-ref>
PodcastPortletInstanceSmall
More information about the jboss-svn-commits
mailing list