You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@roller.apache.org by sn...@apache.org on 2007/11/26 16:44:27 UTC

svn commit: r598312 - in /roller/trunk: apps/planet/src/java/org/apache/roller/planet/business/hibernate/ apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/ apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibern...

Author: snoopdave
Date: Mon Nov 26 07:44:23 2007
New Revision: 598312

URL: http://svn.apache.org/viewvc?rev=598312&view=rev
Log:
Merging Roller 4.1 branch into trunk.

Added:
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/opensearch/
      - copied from r598076, roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/opensearch/
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/opensearch/OpenSearchServlet.java
      - copied unchanged from r598076, roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/opensearch/OpenSearchServlet.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/tagdata/
      - copied from r598076, roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/tagdata/
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServlet.java
      - copied unchanged from r598076, roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/tagdata/TagDataServlet.java
Removed:
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/json/
    roller/trunk/tools/hibernate-3.1/