roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r1172075 [1/4] - in /roller/trunk: ./ planet-business/ planet-business/src/main/java/org/apache/roller/planet/ planet-business/src/main/java/org/apache/roller/planet/business/ planet-business/src/main/java/org/apache/roller/planet/config/ p...
Date Sat, 17 Sep 2011 22:00:40 GMT
Author: snoopdave
Date: Sat Sep 17 22:00:34 2011
New Revision: 1172075

URL: http://svn.apache.org/viewvc?rev=1172075&view=rev
Log:
Merging roller_mobile branch into trunk. Related to https://issues.apache.org/jira/browse/ROL-1919

Added:
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataTemplateCode.java
      - copied unchanged from r1160032, roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataTemplateCode.java
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplateCode.java
      - copied unchanged from r1160032, roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplateCode.java
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.java
      - copied unchanged from r1160032, roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.java
    roller/trunk/weblogger-business/src/test/java/org/apache/roller/weblogger/business/WeblogTemplateCodeTest.java
      - copied unchanged from r1160032, roller/branches/roller_mobile/weblogger-business/src/test/java/org/apache/roller/weblogger/business/WeblogTemplateCodeTest.java
    roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/_day-mobile.vm
      - copied unchanged from r1160032, roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/_day-mobile.vm
    roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/permalink-mobile.vm
      - copied unchanged from r1160032, roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/permalink-mobile.vm
    roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/searchresults-mobile.vm
      - copied unchanged from r1160032, roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/searchresults-mobile.vm
    roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/weblog-mobile.vm
      - copied unchanged from r1160032, roller/branches/roller_mobile/weblogger-webapp/src/main/webapp/themes/basic/weblog-mobile.vm
Modified:
    roller/trunk/   (props changed)
    roller/trunk/planet-business/pom.xml
    roller/trunk/planet-business/src/main/java/org/apache/roller/planet/PlanetException.java   (props changed)
    roller/trunk/planet-business/src/main/java/org/apache/roller/planet/business/   (props changed)
    roller/trunk/planet-business/src/main/java/org/apache/roller/planet/config/   (props changed)
    roller/trunk/planet-business/src/main/java/org/apache/roller/planet/pojos/   (props changed)
    roller/trunk/planet-business/src/main/java/org/apache/roller/planet/tasks/   (props changed)
    roller/trunk/planet-business/src/main/java/org/apache/roller/planet/util/   (props changed)
    roller/trunk/planet-business/src/main/resources/META-INF/   (props changed)
    roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/config/planet.properties   (props changed)
    roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/config/planetRuntimeConfigDefs.xml   (props changed)
    roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml   (props changed)
    roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml   (props changed)
    roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml   (props changed)
    roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml   (props changed)
    roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml   (props changed)
    roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/util/rome/package.html   (props changed)
    roller/trunk/planet-business/src/main/resources/sql/   (props changed)
    roller/trunk/planet-business/src/test/java/org/apache/roller/planet/TestUtils.java   (props changed)
    roller/trunk/planet-business/src/test/java/org/apache/roller/planet/business/   (props changed)
    roller/trunk/planet-business/src/test/java/org/apache/roller/planet/util/   (props changed)
    roller/trunk/planet-business/src/test/resources/commons-logging.properties   (props changed)
    roller/trunk/planet-business/src/test/resources/log4j.properties   (props changed)
    roller/trunk/planet-business/src/test/resources/planet-custom.properties   (props changed)
    roller/trunk/planet-web/pom.xml
    roller/trunk/pom.xml
    roller/trunk/roller-core/pom.xml
    roller/trunk/roller-core/src/main/java/org/   (props changed)
    roller/trunk/roller-core/src/test/java/org/   (props changed)
    roller/trunk/test-utils/pom.xml
    roller/trunk/test-utils/src/main/java/org/apache/roller/weblogger/ant/   (props changed)
    roller/trunk/weblogger-assembly/pom.xml
    roller/trunk/weblogger-business/pom.xml
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/TestUtils.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/WebloggerException.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedTheme.java
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadata.java
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataTemplate.java
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/config/   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/business/jpa/   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/BookmarkComparator.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/FileContent.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileComparator.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectoryComparator.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileFilter.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileTag.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileType.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/ObjectPermission.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/PingQueueEntry.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/PingTarget.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Resource.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/RollerPermission.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StatCount.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StatCountCountComparator.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java   (contents, props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java   (contents, props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TagStat.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TagStatComparator.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TagStatCountComparator.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TaskLock.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Template.java   (contents, props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Theme.java   (contents, props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/ThemeResource.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java   (contents, props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/User.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/UserAttribute.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/UserRole.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java   (contents, props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategory.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategoryPathComparator.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryWrapperComparator.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogHitCount.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogReferrer.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java   (contents, props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTheme.java   (props changed)
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
    roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/util/   (props changed)
    roller/trunk/weblogger-business/src/main/resources/META-INF/persistence.xml
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/jpa/package.html   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/package.html   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/pings/package.html   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/plugins/comment/package.html   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/plugins/entry/package.html   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/plugins/package.html   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/referrers/package.html   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/runnable/package.html   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/search/operations/package.html   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/search/package.html   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/startup/package.html   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/themes/package.html   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/package.html   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/runtime/package.html   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/planet/business/jpa/package.html   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/planet/business/package.html   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/planet/tasks/package.html   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/datamodel40.png   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/package.html   (props changed)
    roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/wrapper/   (props changed)
    roller/trunk/weblogger-business/src/main/resources/sql/   (props changed)
    roller/trunk/weblogger-business/src/main/resources/sql/createdb.vm
    roller/trunk/weblogger-business/src/main/resources/sql/droptables.sql
    roller/trunk/weblogger-business/src/test/java/org/apache/roller/weblogger/business/   (props changed)
    roller/trunk/weblogger-business/src/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java
    roller/trunk/weblogger-business/src/test/java/org/apache/roller/weblogger/planet/   (props changed)
    roller/trunk/weblogger-business/src/test/java/org/apache/roller/weblogger/util/   (props changed)
    roller/trunk/weblogger-business/src/test/resources/WEB-INF/   (props changed)
    roller/trunk/weblogger-business/src/test/resources/adminapi-testdata/   (props changed)
    roller/trunk/weblogger-business/src/test/resources/planet-custom.properties   (props changed)
    roller/trunk/weblogger-business/src/test/resources/roller-custom.properties   (props changed)
    roller/trunk/weblogger-business/src/test/resources/uploadsdir/   (props changed)
    roller/trunk/weblogger-business/src/test/resources/uploadsdir/testblog1/sub1/hawk.jpg   (props changed)
    roller/trunk/weblogger-business/src/test/resources/uploadsdir/testblog1/sub1/sub2/nasa.jpg   (props changed)
    roller/trunk/weblogger-war-assembly/pom.xml
    roller/trunk/weblogger-web/pom.xml
    roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/   (props changed)
    roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/RendererManager.java
    roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java
    roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
    roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
    roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
    roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/ParsedRequest.java
    roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java
    roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPreviewRequest.java
    roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
    roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblogBean.java
    roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/StylesheetEdit.java
    roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
    roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java
    roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
    roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/webservices/   (props changed)
    roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java
    roller/trunk/weblogger-web/src/test/java/org/apache/roller/weblogger/ui/   (props changed)
    roller/trunk/weblogger-webapp/pom.xml
    roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp
    roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp
    roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp
    roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp
    roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/ThemeEditSharedThemesOnly.jsp
    roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/velocity/weblog.vm
    roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/theme.xml
    roller/trunk/weblogger-webapp/src/main/webapp/themes/basic/weblog.vm
    roller/trunk/weblogger-webapp/src/main/webapp/themes/brushedmetal/theme.xml
    roller/trunk/weblogger-webapp/src/main/webapp/themes/fauxcoly/theme.xml
    roller/trunk/weblogger-webapp/src/main/webapp/themes/frontpage/theme.xml
    roller/trunk/weblogger-webapp/src/main/webapp/themes/sotto/theme.xml

Propchange: roller/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1,2 +1,3 @@
 /roller/branches/roller_mavenized:894711-895418
 /roller/branches/roller_mediablogging:713070-782269
+/roller/branches/roller_mobile:1139921-1160032

Modified: roller/trunk/planet-business/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/planet-business/pom.xml?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/planet-business/pom.xml (original)
+++ roller/trunk/planet-business/pom.xml Sat Sep 17 22:00:34 2011
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>5.0.0</version>
+        <version>5.1.0-mobile-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -19,7 +19,7 @@
     </description>
     <groupId>org.apache.roller</groupId>
     <artifactId>roller-planet-business</artifactId>
-    <version>5.0.0</version>
+    <version>5.1.0-mobile-dev</version>
 
     <properties>
         <testOutputDirectory>${project.build.testOutputDirectory}</testOutputDirectory>

Propchange: roller/trunk/planet-business/src/main/java/org/apache/roller/planet/PlanetException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/PlanetException.java:713070-782269
+/roller/branches/roller_mobile/planet-business/src/main/java/org/apache/roller/planet/PlanetException.java:1139921-1160032

Propchange: roller/trunk/planet-business/src/main/java/org/apache/roller/planet/business/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1,3 +1,4 @@
 /roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/business:894711-895418
 /roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/business:713070-782269
 /roller/branches/roller_mediablogging/planet-business/src/main/java/org/apache/roller/planet/business:713070-782269
+/roller/branches/roller_mobile/planet-business/src/main/java/org/apache/roller/planet/business:1139921-1160032

Propchange: roller/trunk/planet-business/src/main/java/org/apache/roller/planet/config/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1,3 +1,4 @@
 /roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/config:894711-895418
 /roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/config:713070-782269
 /roller/branches/roller_mediablogging/planet-business/src/main/java/org/apache/roller/planet/config:713070-782269
+/roller/branches/roller_mobile/planet-business/src/main/java/org/apache/roller/planet/config:1139921-1160032

Propchange: roller/trunk/planet-business/src/main/java/org/apache/roller/planet/pojos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1,3 +1,4 @@
 /roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/pojos:894711-895418
 /roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/pojos:713070-782269
 /roller/branches/roller_mediablogging/planet-business/src/main/java/org/apache/roller/planet/pojos:713070-782269
+/roller/branches/roller_mobile/planet-business/src/main/java/org/apache/roller/planet/pojos:1139921-1160032

Propchange: roller/trunk/planet-business/src/main/java/org/apache/roller/planet/tasks/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1,3 +1,4 @@
 /roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/tasks:894711-895418
 /roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/tasks:713070-782269
 /roller/branches/roller_mediablogging/planet-business/src/main/java/org/apache/roller/planet/tasks:713070-782269
+/roller/branches/roller_mobile/planet-business/src/main/java/org/apache/roller/planet/tasks:1139921-1160032

Propchange: roller/trunk/planet-business/src/main/java/org/apache/roller/planet/util/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1,3 +1,4 @@
 /roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/util:894711-895418
 /roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/util:713070-782269
 /roller/branches/roller_mediablogging/planet-business/src/main/java/org/apache/roller/planet/util:713070-782269
+/roller/branches/roller_mobile/planet-business/src/main/java/org/apache/roller/planet/util:1139921-1160032

Propchange: roller/trunk/planet-business/src/main/resources/META-INF/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1,3 +1,4 @@
 /roller/branches/roller_mavenized/planet-business/src/main/resources/META-INF:894711-895418
 /roller/branches/roller_mediablogging/apps/planet/src/java/META-INF:713070-782269
 /roller/branches/roller_mediablogging/planet-business/src/main/resources/META-INF:713070-782269
+/roller/branches/roller_mobile/planet-business/src/main/resources/META-INF:1139921-1160032

Propchange: roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/config/planet.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/config/planet.properties:713070-782269
+/roller/branches/roller_mobile/planet-business/src/main/resources/org/apache/roller/planet/config/planet.properties:1139921-1160032

Propchange: roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/config/planetRuntimeConfigDefs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/config/planetRuntimeConfigDefs.xml:713070-782269
+/roller/branches/roller_mobile/planet-business/src/main/resources/org/apache/roller/planet/config/planetRuntimeConfigDefs.xml:1139921-1160032

Propchange: roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/pojos/Planet.orm.xml:713070-782269
+/roller/branches/roller_mobile/planet-business/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml:1139921-1160032

Propchange: roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroup.orm.xml:713070-782269
+/roller/branches/roller_mobile/planet-business/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml:1139921-1160032

Propchange: roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml:713070-782269
+/roller/branches/roller_mobile/planet-business/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml:1139921-1160032

Propchange: roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/pojos/Subscription.orm.xml:713070-782269
+/roller/branches/roller_mobile/planet-business/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml:1139921-1160032

Propchange: roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml:713070-782269
+/roller/branches/roller_mobile/planet-business/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml:1139921-1160032

Propchange: roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/util/rome/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/util/rome/package.html:713070-782269
+/roller/branches/roller_mobile/planet-business/src/main/resources/org/apache/roller/planet/util/rome/package.html:1139921-1160032

Propchange: roller/trunk/planet-business/src/main/resources/sql/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1,3 +1,4 @@
 /roller/branches/roller_mavenized/planet-business/src/main/resources/sql:894711-895418
 /roller/branches/roller_mediablogging/apps/planet/src/sql:713070-782269
 /roller/branches/roller_mediablogging/planet-business/src/main/resources/sql:713070-782269
+/roller/branches/roller_mobile/planet-business/src/main/resources/sql:1139921-1160032

Propchange: roller/trunk/planet-business/src/test/java/org/apache/roller/planet/TestUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/planet/test/java/org/apache/roller/planet/TestUtils.java:713070-782269
+/roller/branches/roller_mobile/planet-business/src/test/java/org/apache/roller/planet/TestUtils.java:1139921-1160032

Propchange: roller/trunk/planet-business/src/test/java/org/apache/roller/planet/business/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1,3 +1,4 @@
 /roller/branches/roller_mavenized/planet-business/src/test/java/org/apache/roller/planet/business:894711-895418
 /roller/branches/roller_mediablogging/apps/planet/test/java/org/apache/roller/planet/business:713070-782269
 /roller/branches/roller_mediablogging/planet-business/src/test/java/org/apache/roller/planet/business:713070-782269
+/roller/branches/roller_mobile/planet-business/src/test/java/org/apache/roller/planet/business:1139921-1160032

Propchange: roller/trunk/planet-business/src/test/java/org/apache/roller/planet/util/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1,3 +1,4 @@
 /roller/branches/roller_mavenized/planet-business/src/test/java/org/apache/roller/planet/util:894711-895418
 /roller/branches/roller_mediablogging/apps/planet/test/java/org/apache/roller/planet/util:713070-782269
 /roller/branches/roller_mediablogging/planet-business/src/test/java/org/apache/roller/planet/util:713070-782269
+/roller/branches/roller_mobile/planet-business/src/test/java/org/apache/roller/planet/util:1139921-1160032

Propchange: roller/trunk/planet-business/src/test/resources/commons-logging.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/planet/testdata/commons-logging.properties:713070-782269
+/roller/branches/roller_mobile/planet-business/src/test/resources/commons-logging.properties:1139921-1160032

Propchange: roller/trunk/planet-business/src/test/resources/log4j.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/planet/testdata/log4j.properties:713070-782269
+/roller/branches/roller_mobile/planet-business/src/test/resources/log4j.properties:1139921-1160032

Propchange: roller/trunk/planet-business/src/test/resources/planet-custom.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/planet/testdata/planet-custom.properties:713070-782269
+/roller/branches/roller_mobile/planet-business/src/test/resources/planet-custom.properties:1139921-1160032

Modified: roller/trunk/planet-web/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/pom.xml?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/planet-web/pom.xml (original)
+++ roller/trunk/planet-web/pom.xml Sat Sep 17 22:00:34 2011
@@ -7,14 +7,14 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>5.0.0</version>
+        <version>5.1.0-mobile-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>Apache Roller Planet Web Application</name>
     <groupId>org.apache.roller</groupId>
     <artifactId>roller-planet-web</artifactId>
-    <version>5.0.0</version>
+    <version>5.1.0-mobile-dev</version>
     <packaging>war</packaging>
 
     <dependencies>
@@ -22,13 +22,13 @@
         <dependency>
             <groupId>org.apache.roller</groupId>
             <artifactId>roller-core</artifactId>
-            <version>5.0.0</version>
+            <version>5.1.0-mobile-dev</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.roller</groupId>
             <artifactId>roller-planet-business</artifactId>
-            <version>5.0.0</version>
+            <version>5.1.0-mobile-dev</version>
         </dependency>
 
         <dependency>
@@ -173,7 +173,7 @@
         <dependency>
             <groupId>org.apache.roller</groupId>
             <artifactId>test-utils</artifactId>
-            <version>5.0.0</version>
+            <version>5.1.0-mobile-dev</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -293,7 +293,7 @@
                     <dependency>
                         <groupId>org.apache.roller</groupId>
                         <artifactId>test-utils</artifactId>
-                        <version>5.0.0</version>
+                        <version>5.1.0-mobile-dev</version>
                     </dependency>
                     <dependency>
                         <groupId>log4j</groupId>
@@ -303,7 +303,7 @@
                     <dependency>
                         <groupId>org.apache.roller</groupId>
                         <artifactId>test-utils</artifactId>
-                        <version>5.0.0</version>
+                        <version>5.1.0-mobile-dev</version>
                     </dependency>
                 </dependencies>
             </plugin>

Modified: roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Sat Sep 17 22:00:34 2011
@@ -8,7 +8,7 @@
     <groupId>org.apache.roller</groupId>
     <artifactId>roller-project</artifactId>
 
-    <version>5.0.0</version>
+    <version>5.1.0-mobile-dev</version>
     <packaging>pom</packaging>
 
     <name>Apache Roller Project</name>
@@ -27,7 +27,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <roller.version>5.0.0</roller.version>
+        <roller.version>5.1.0-mobile-dev</roller.version>
         <!-- avoid CLOB/BLOB error in all later versions of Derby -->
         <derby.version>10.1.3.1</derby.version>
     </properties>

Modified: roller/trunk/roller-core/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/roller-core/pom.xml?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/roller-core/pom.xml (original)
+++ roller/trunk/roller-core/pom.xml Sat Sep 17 22:00:34 2011
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>5.0.0</version>
+        <version>5.1.0-mobile-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     </description>
     <groupId>org.apache.roller</groupId>
     <artifactId>roller-core</artifactId>
-    <version>5.0.0</version>
+    <version>5.1.0-mobile-dev</version>
 
     <dependencies>
 

Propchange: roller/trunk/roller-core/src/main/java/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1,3 +1,4 @@
 /roller/branches/roller_mavenized/roller-core/src/main/java/org:894711-895418
 /roller/branches/roller_mediablogging/components/core/src/java/org:713070-782269
 /roller/branches/roller_mediablogging/roller-core/src/main/java/org:713070-782269
+/roller/branches/roller_mobile/roller-core/src/main/java/org:1139921-1160032

Propchange: roller/trunk/roller-core/src/test/java/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1,3 +1,4 @@
 /roller/branches/roller_mavenized/roller-core/src/test/java/org:894711-895418
 /roller/branches/roller_mediablogging/components/core/test/java/org:713070-782269
 /roller/branches/roller_mediablogging/roller-core/src/test/java/org:713070-782269
+/roller/branches/roller_mobile/roller-core/src/test/java/org:1139921-1160032

Modified: roller/trunk/test-utils/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/test-utils/pom.xml?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/test-utils/pom.xml (original)
+++ roller/trunk/test-utils/pom.xml Sat Sep 17 22:00:34 2011
@@ -7,21 +7,21 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>5.0.0</version>
+        <version>5.1.0-mobile-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>Apache Roller Test Utilities</name>
     <groupId>org.apache.roller</groupId>
     <artifactId>test-utils</artifactId>
-    <version>5.0.0</version>
+    <version>5.1.0-mobile-dev</version>
 
     <dependencies>
 
         <dependency>
             <groupId>org.apache.roller</groupId>
             <artifactId>roller-core</artifactId>
-            <version>5.0.0</version>
+            <version>5.1.0-mobile-dev</version>
         </dependency>
 
         <dependency>

Propchange: roller/trunk/test-utils/src/main/java/org/apache/roller/weblogger/ant/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1,3 +1,4 @@
 /roller/branches/roller_mavenized/test-utils/src/main/java/org/apache/roller/weblogger/ant:894711-895418
 /roller/branches/roller_mediablogging/apps/weblogger/test/java/org/apache/roller/weblogger/ant:713070-782269
 /roller/branches/roller_mediablogging/test-utils/src/main/java/org/apache/roller/weblogger/ant:713070-782269
+/roller/branches/roller_mobile/test-utils/src/main/java/org/apache/roller/weblogger/ant:1139921-1160032

Modified: roller/trunk/weblogger-assembly/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-assembly/pom.xml?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/weblogger-assembly/pom.xml (original)
+++ roller/trunk/weblogger-assembly/pom.xml Sat Sep 17 22:00:34 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>5.0.0</version>
+        <version>5.1.0-mobile-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

Modified: roller/trunk/weblogger-business/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/pom.xml?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/pom.xml (original)
+++ roller/trunk/weblogger-business/pom.xml Sat Sep 17 22:00:34 2011
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>5.0.0</version>
+        <version>5.1.0-mobile-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     </description>
     <groupId>org.apache.roller</groupId>
     <artifactId>roller-weblogger-business</artifactId>
-    <version>5.0.0</version>
+    <version>5.1.0-mobile-dev</version>
 
     <properties>
         <testOutputDirectory>${project.build.testOutputDirectory}</testOutputDirectory>
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.apache.roller</groupId>
             <artifactId>roller-core</artifactId>
-            <version>5.0.0</version>
+            <version>5.1.0-mobile-dev</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.roller</groupId>
             <artifactId>roller-planet-business</artifactId>
-            <version>5.0.0</version>
+            <version>5.1.0-mobile-dev</version>
         </dependency>
 
         <!-- OpenJPA deps -->

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/TestUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/TestUtils.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/WebloggerException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/WebloggerException.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/WebloggerException.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1,3 +1,4 @@
 /roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/business:894711-895418
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business:713070-782269
 /roller/branches/roller_mediablogging/weblogger-business/src/main/java/org/apache/roller/weblogger/business:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/business:1139921-1160032

Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java Sat Sep 17 22:00:34 2011
@@ -22,9 +22,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.pojos.User;
-import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.WeblogTemplate;
+import org.apache.roller.weblogger.pojos.*;
 
 
 /**
@@ -44,6 +42,13 @@ public interface WeblogManager {
      * Store a single weblog.
      */
     public void saveWeblog(Weblog data) throws WebloggerException;
+
+    /**
+     * Save new theme associativity for Weblog
+     * @param themeAssoc
+     * @throws WebloggerException
+     */
+    public void saveThemeAssoc(WeblogThemeAssoc themeAssoc) throws WebloggerException;
     
     
     /**
@@ -176,8 +181,18 @@ public interface WeblogManager {
      */
     public WeblogTemplate getPageByLink(Weblog w, String p)
         throws WebloggerException;
-    
-    
+
+    /**
+     * Get template code by Type.
+     */
+    public WeblogTemplateCode getTemplateCodeByType(String templateName, String type)
+            throws WebloggerException ;
+
+    /**
+     * Save template code
+     */
+     public void saveTemplateCode(WeblogTemplateCode templateCode) throws WebloggerException;
+
     /**
      * Get website's pages
      */
@@ -194,4 +209,9 @@ public interface WeblogManager {
      * Release any resources held by manager.
      */
     public void release();
+
+    /**
+     *   get Theme Associativity object for type
+     */
+    public WeblogThemeAssoc getThemeAssoc(Weblog weblog , String type) throws WebloggerException;
 }

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -0,0 +1 @@
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java:1139921-1160032

Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java Sat Sep 17 22:00:34 2011
@@ -18,51 +18,19 @@
 
 package org.apache.roller.weblogger.business.jpa;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.sql.Timestamp;
-import java.util.Comparator;
-import java.util.Hashtable;
-import javax.persistence.NoResultException;
-
-import javax.persistence.Query;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.BookmarkManager;
-import org.apache.roller.weblogger.business.MediaFileManager;
-import org.apache.roller.weblogger.business.UserManager;
-import org.apache.roller.weblogger.business.WeblogEntryManager;
-import org.apache.roller.weblogger.business.WeblogManager;
-import org.apache.roller.weblogger.business.Weblogger;
-import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.business.*;
 import org.apache.roller.weblogger.business.pings.AutoPingManager;
 import org.apache.roller.weblogger.business.pings.PingTargetManager;
 import org.apache.roller.weblogger.config.WebloggerConfig;
-import org.apache.roller.weblogger.pojos.AutoPing;
-import org.apache.roller.weblogger.pojos.MediaFileDirectory;
-import org.apache.roller.weblogger.pojos.PingQueueEntry;
-import org.apache.roller.weblogger.pojos.PingTarget;
-import org.apache.roller.weblogger.pojos.WeblogReferrer;
-import org.apache.roller.weblogger.pojos.StatCount;
-import org.apache.roller.weblogger.pojos.StatCountCountComparator;
-import org.apache.roller.weblogger.pojos.TagStat;
-import org.apache.roller.weblogger.pojos.WeblogCategory;
-import org.apache.roller.weblogger.pojos.WeblogEntry;
-import org.apache.roller.weblogger.pojos.WeblogEntryTagAggregate;
-import org.apache.roller.weblogger.pojos.WeblogEntryTag;
-import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.User;
-import org.apache.roller.weblogger.pojos.WeblogBookmark;
-import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
-import org.apache.roller.weblogger.pojos.WeblogPermission;
-import org.apache.roller.weblogger.pojos.WeblogTemplate;
+import org.apache.roller.weblogger.pojos.*;
+
+import javax.persistence.NoResultException;
+import javax.persistence.Query;
+import java.sql.Timestamp;
+import java.util.*;
 
 
 /*
@@ -130,6 +98,17 @@ public class JPAWeblogManagerImpl implem
         WeblogEntryManager emgr = roller.getWeblogEntryManager();
         BookmarkManager    bmgr = roller.getBookmarkManager();
         MediaFileManager   mmgr = roller.getMediaFileManager();
+
+        //remove theme Assocs
+
+        Query themeAssocQuery = strategy.getNamedQuery("WeblogThemeAssoc.getThemeAssocsByWeblog");
+        themeAssocQuery.setParameter(1,website);
+         List assocResults = themeAssocQuery.getResultList();
+
+        for(Iterator iter = assocResults.iterator(); iter.hasNext();) {
+            WeblogThemeAssoc themeAssoc = (WeblogThemeAssoc) iter.next();
+            this.strategy.remove(themeAssoc);
+        }
         
         // remove tags
         Query tagQuery = strategy.getNamedQuery("WeblogEntryTag.getByWeblog");
@@ -204,6 +183,10 @@ public class JPAWeblogManagerImpl implem
         List pages = pageQuery.getResultList();
         for (Iterator iter = pages.iterator(); iter.hasNext();) {
             WeblogTemplate page = (WeblogTemplate) iter.next();
+
+            //remove associated templateCode objects
+            this.removeTemplateCodeObjs(page);
+
             this.strategy.remove(page);
         }
         
@@ -273,10 +256,17 @@ public class JPAWeblogManagerImpl implem
         // update weblog last modified date.  date updated by saveWebsite()
         roller.getWeblogManager().saveWeblog(page.getWebsite());
     }
+
+    public void saveTemplateCode(WeblogTemplateCode templateCode) throws WebloggerException {
+        this.strategy.store(templateCode);
+        // update of the template should happen by saving template page.
+    }
     
     public void removePage(WeblogTemplate page) throws WebloggerException {
+        //remove template code objects
+       this.removeTemplateCodeObjs(page);
+
         this.strategy.remove(page);
-        
         // update weblog last modified date.  date updated by saveWebsite()
         roller.getWeblogManager().saveWeblog(page.getWebsite());
     }
@@ -493,6 +483,28 @@ public class JPAWeblogManagerImpl implem
         
         return query.getResultList();
     }
+
+    public WeblogThemeAssoc getThemeAssoc(Weblog weblog , String type) throws WebloggerException {
+
+        if(weblog == null){
+            throw new WebloggerException("Weblog is null");
+        }
+        if(type == null){
+            throw new WebloggerException("Type is null");
+        }
+        Query query = strategy.getNamedQuery("WeblogThemeAssoc.getThemeAssocByType") ;
+        query.setParameter(1,weblog);
+        query.setParameter(2,type);
+
+        return (WeblogThemeAssoc) query.getSingleResult();
+    }
+
+    public void saveThemeAssoc(WeblogThemeAssoc themeAssoc) throws WebloggerException {
+          this.strategy.store(themeAssoc);
+
+        // update weblog last modified date.  date updated by saveWebsite()
+        roller.getWeblogManager().saveWeblog(themeAssoc.getWeblog());
+    }
         
     public List getUserWeblogs(User user, boolean enabledOnly) throws WebloggerException {
         List weblogs = new ArrayList();
@@ -547,7 +559,7 @@ public class JPAWeblogManagerImpl implem
         query.setParameter(1, website);
         query.setParameter(2, pagelink);
         try {
-            return (WeblogTemplate)query.getSingleResult();
+            return (WeblogTemplate) query.getSingleResult();
         } catch (NoResultException e) {
             return null;
         }
@@ -597,7 +609,25 @@ public class JPAWeblogManagerImpl implem
             return null;
         }
     }
-    
+
+    public WeblogTemplateCode getTemplateCodeByType(String templateId, String type) throws WebloggerException{
+         if(templateId == null)
+             throw new WebloggerException("Template Name is null");
+
+        if(type == null){
+            throw  new WebloggerException("Type is null");
+        }
+
+        Query query = strategy.getNamedQuery("WeblogThemplateCode.getTemplateCodeByType");
+        query.setParameter(1, templateId);
+        query.setParameter(2, type);
+        try {
+            return (WeblogTemplateCode)query.getSingleResult();
+        } catch (NoResultException e) {
+            return null;
+        }
+    }
+
     /**
      * @see org.apache.roller.weblogger.model.UserManager#getPages(Weblog)
      */
@@ -700,4 +730,16 @@ public class JPAWeblogManagerImpl implem
         return ret;
     }
 
+    private void removeTemplateCodeObjs(WeblogTemplate page) throws WebloggerException {
+        Query codeQuery = strategy.getNamedQuery("WeblogThemplateCode.getTemplateCodesByTemplateId");
+        codeQuery.setParameter(1, page.getId());
+        List codeList = codeQuery.getResultList();
+
+        for (Iterator itr = codeList.iterator(); itr.hasNext(); ) {
+            WeblogTemplateCode templateCode = (WeblogTemplateCode) itr.next();
+            this.strategy.remove(templateCode);
+        }
+
+    }
+
 }

Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedTheme.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedTheme.java?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedTheme.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedTheme.java Sat Sep 17 22:00:34 2011
@@ -18,18 +18,12 @@
 
 package org.apache.roller.weblogger.business.themes;
 
-import java.io.File;
+import org.apache.roller.weblogger.pojos.Theme;
+import org.apache.roller.weblogger.pojos.ThemeResource;
+
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
-import org.apache.roller.weblogger.pojos.Theme;
-import org.apache.roller.weblogger.pojos.ThemeResource;
-import org.apache.roller.weblogger.pojos.ThemeTemplate;
 
 
 /**
@@ -41,6 +35,7 @@ public abstract class SharedTheme implem
     protected String id = null;
     protected String name = null;
     protected String description = null;
+    private   String type = null;
     protected String author = null;
     protected Date lastModified = null;
     protected boolean enabled = false;
@@ -107,4 +102,11 @@ public abstract class SharedTheme implem
         this.enabled = enabled;
     }
 
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 }

Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java Sat Sep 17 22:00:34 2011
@@ -18,23 +18,18 @@
 
 package org.apache.roller.weblogger.business.themes;
 
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.roller.weblogger.WebloggerException;
+import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.pojos.*;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.pojos.ThemeResource;
-import org.apache.roller.weblogger.pojos.ThemeTemplate;
-import org.apache.roller.weblogger.pojos.WeblogTemplate;
+import java.util.*;
 
 
 /**
@@ -60,7 +55,7 @@ public class SharedThemeFromDir extends 
     private Map templatesByName = new HashMap();
     
     // we keep templates in a Map for faster lookups by link
-    // the Map contains ... (template link, ThemeTemplate)
+    // the Map contains ... (template link, List<tThemeTemplate>)
     private Map templatesByLink = new HashMap();
     
     // we keep templates in a Map for faster lookups by action
@@ -88,8 +83,8 @@ public class SharedThemeFromDir extends 
     public ThemeResource getPreviewImage() {
         return this.previewImage;
     }
-    
-    
+
+
     /**
      * Get the collection of all templates associated with this Theme.
      */
@@ -129,7 +124,7 @@ public class SharedThemeFromDir extends 
      * Lookup the specified template by link.
      * Returns null if the template cannot be found.
      */
-    public ThemeTemplate getTemplateByLink(String link) {
+     public ThemeTemplate getTemplateByLink(String link) {
         return (ThemeTemplate) this.templatesByLink.get(link);
     }
     
@@ -206,6 +201,7 @@ public class SharedThemeFromDir extends 
         setId(themeMetadata.getId());
         setName(themeMetadata.getName());
         setDescription(themeMetadata.getName());
+        setType(themeMetadata.getType());
         setAuthor(themeMetadata.getAuthor());
         setLastModified(null);
         setEnabled(true);
@@ -217,15 +213,39 @@ public class SharedThemeFromDir extends 
         } else {
             this.previewImage = new SharedThemeResourceFromDir(themeMetadata.getPreviewImage(), previewFile);
         }
-        
+
+        //avaialble types in the Roller
+        List<String> availableTypesList = new ArrayList<String>();
+        availableTypesList.add("standard");
+        availableTypesList.add("mobile");
+
         // load stylesheet if possible
         if(themeMetadata.getStylesheet() != null) {
             
             ThemeMetadataTemplate stylesheetTmpl = themeMetadata.getStylesheet();
-            
+           //getting the template codes for available types
+           ThemeMetadataTemplateCode standardTemplateCode= stylesheetTmpl.getTemplateCodeTable().get("standard");
+           ThemeMetadataTemplateCode mobileTemplateCode= stylesheetTmpl.getTemplateCodeTable().get("mobile");
+
+            //If no template code present for any type
+            if (standardTemplateCode == null && mobileTemplateCode == null) {
+                throw new ThemeInitializationException("Error in getting template codes for template");
+            } else if(mobileTemplateCode == null){
+                //cloning the standard template code if no mobile is present
+               mobileTemplateCode = new ThemeMetadataTemplateCode();
+               mobileTemplateCode.setContentsFile(standardTemplateCode.getContentsFile());
+               mobileTemplateCode.setContentType(standardTemplateCode.getContentType());
+               mobileTemplateCode.setTemplateLang(standardTemplateCode.getTemplateLang());
+               mobileTemplateCode.setType("mobile");
+
+                stylesheetTmpl.addTemplateCode("mobile",mobileTemplateCode);
+            }
+
+
             // construct File object from path
+            // we are getting the file path from standard as the default and load it to initially.
             File templateFile = new File(this.themeDir + File.separator + 
-                    stylesheetTmpl.getContentsFile());
+                    standardTemplateCode.getContentsFile());
             
             // read stylesheet contents
             String contents = loadTemplateFile(templateFile);
@@ -235,6 +255,7 @@ public class SharedThemeFromDir extends 
             } else {
                 
                 // construct ThemeTemplate representing this file
+                // here we set content and template language from standard template code assuming it is the default
                 SharedThemeTemplate theme_template = new SharedThemeTemplate(
                         this,
                         themeMetadata.getId()+":"+stylesheetTmpl.getName(),
@@ -244,14 +265,20 @@ public class SharedThemeFromDir extends 
                         contents,
                         stylesheetTmpl.getLink(),
                         new Date(templateFile.lastModified()),
-                        stylesheetTmpl.getTemplateLanguage(),
+                        standardTemplateCode.getTemplateLang(),
                         false,
                         false);
-                
-                // store it
+
+
+                for (String type : availableTypesList) {
+                    WeblogTemplateCode templateCode = createTemplateCode(theme_template.getId(), stylesheetTmpl.
+                            getTemplateCode(type));
+
+                    theme_template.addTemplateCode(type, templateCode);
+                }
+                  // store it
                 this.stylesheet = theme_template;
-                
-                // add it to templates list
+
                 addTemplate(theme_template);
             }
             
@@ -288,15 +315,35 @@ public class SharedThemeFromDir extends 
         }
         
         // go through templates and read in contents to a ThemeTemplate
-        ThemeTemplate theme_template = null;
+        SharedThemeTemplate theme_template = null;
         ThemeMetadataTemplate templateMetadata = null;
         Iterator templatesIter = themeMetadata.getTemplates().iterator();
         while (templatesIter.hasNext()) {
             templateMetadata = (ThemeMetadataTemplate) templatesIter.next();
+
+             //getting the template codes for available types
+           ThemeMetadataTemplateCode standardTemplateCode= templateMetadata.getTemplateCodeTable().get("standard");
+           ThemeMetadataTemplateCode mobileTemplateCode= templateMetadata.getTemplateCodeTable().get("mobile");
+
+            //If no template code present for any type
+            if(standardTemplateCode ==null && mobileTemplateCode == null){
+                throw  new ThemeInitializationException("Error in getting template codes for template");
+            }
+
+            else if(mobileTemplateCode == null){
+                 //cloning the standard template code if no mobile is present
+               mobileTemplateCode = new ThemeMetadataTemplateCode();
+               mobileTemplateCode.setContentsFile(standardTemplateCode.getContentsFile());
+               mobileTemplateCode.setContentType(standardTemplateCode.getContentType());
+               mobileTemplateCode.setTemplateLang(standardTemplateCode.getTemplateLang());
+               mobileTemplateCode.setType("mobile");
+
+               templateMetadata.addTemplateCode("mobile",mobileTemplateCode);
+            }
             
             // construct File object from path
             File templateFile = new File(this.themeDir + File.separator + 
-                    templateMetadata.getContentsFile());
+                    standardTemplateCode.getContentsFile());
             
             String contents = loadTemplateFile(templateFile);
             if(contents == null) {
@@ -314,9 +361,17 @@ public class SharedThemeFromDir extends 
                     contents,
                     templateMetadata.getLink(),
                     new Date(templateFile.lastModified()),
-                    templateMetadata.getTemplateLanguage(),
+                    standardTemplateCode.getTemplateLang(),
                     templateMetadata.isHidden(),
-                    templateMetadata.isNavbar());
+                    templateMetadata.isNavbar()
+                    );
+
+            for (String type : availableTypesList) {
+                WeblogTemplateCode templateCode = createTemplateCode(theme_template.getId(),
+                        templateMetadata.getTemplateCode(type));
+
+                theme_template.addTemplateCode(type, templateCode);
+            }
 
             // add it to the theme
             addTemplate(theme_template);
@@ -358,7 +413,7 @@ public class SharedThemeFromDir extends 
     }
     
     
-    /**
+   /**
      * Set the value for a given template name.
      */
     private void addTemplate(ThemeTemplate template) {
@@ -378,5 +433,29 @@ public class SharedThemeFromDir extends 
         String normalizedPath = StringUtils.replace(path, "\\", "/");
         this.resources.put(normalizedPath, resource);
     }
-    
+
+    private WeblogTemplateCode createTemplateCode(String templateId, ThemeMetadataTemplateCode templateCodeMetadata){
+        WeblogTemplateCode templateCode = new WeblogTemplateCode();
+
+         // construct File object from path
+            File templateFile = new File(this.themeDir + File.separator +
+                    templateCodeMetadata.getContentsFile());
+
+            // read stylesheet contents
+            String contents = loadTemplateFile(templateFile);
+            if(contents == null) {
+                // if we don't have any contents then load no string
+                contents ="";
+                log.error("Couldn't load stylesheet theme [" + this.getName() + "] template file ["+templateFile+"]");
+            }
+
+            templateCode.setTemplateId(templateId);
+            templateCode.setTemplate(contents);
+            templateCode.setTemplateLanguage(templateCodeMetadata.getTemplateLang());
+            templateCode.setType(templateCodeMetadata.getType());
+            templateCode.setContentType(templateCodeMetadata.getContentType());
+
+        return templateCode;
+    }
+
 }

Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java Sat Sep 17 22:00:34 2011
@@ -18,10 +18,15 @@
 
 package org.apache.roller.weblogger.business.themes;
 
-import java.io.Serializable;
-import java.util.Date;
 import org.apache.roller.weblogger.WebloggerException;
+import org.apache.roller.weblogger.business.WebloggerFactory;
 import org.apache.roller.weblogger.pojos.ThemeTemplate;
+import org.apache.roller.weblogger.pojos.WeblogTemplate;
+import org.apache.roller.weblogger.pojos.WeblogTemplateCode;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
 
 
 /**
@@ -41,8 +46,12 @@ public class SharedThemeTemplate impleme
     private boolean hidden = false;
     private boolean navbar = false;
     private String  outputContentType = null;
+    private String type = null;
     
     private SharedTheme myTheme = null;
+
+    //hash map to cache template Code objects parsed
+    private HashMap<String,WeblogTemplateCode> templateCodeHashMap = new HashMap<String, WeblogTemplateCode>();
     
     
     public SharedThemeTemplate() {}
@@ -171,5 +180,20 @@ public class SharedThemeTemplate impleme
     public void setAction(String action) {
         this.action = action;
     }
-    
+
+    public String getType() {
+        return type;
+    }
+
+    public WeblogTemplateCode getTemplateCode(String type) throws WebloggerException {
+        return templateCodeHashMap.get(type);
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public void addTemplateCode(String type , WeblogTemplateCode templateCode){
+        this.templateCodeHashMap.put(type ,templateCode);
+    }
 }

Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java Sat Sep 17 22:00:34 2011
@@ -92,4 +92,5 @@ public interface ThemeManager {
 	 * @return true, if reloaded theme from disk
 	 */
 	public boolean reLoadThemeFromDisk(String reloadTheme);
+
 }

Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java Sat Sep 17 22:00:34 2011
@@ -35,25 +35,15 @@ import javax.activation.MimetypesFileTyp
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.InitializationException;
-import org.apache.roller.weblogger.business.MediaFileManager;
-import org.apache.roller.weblogger.business.Weblogger;
-import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.business.*;
 import org.apache.roller.weblogger.config.WebloggerConfig;
-import org.apache.roller.weblogger.pojos.MediaFileDirectory;
-import org.apache.roller.weblogger.pojos.Theme;
-import org.apache.roller.weblogger.pojos.ThemeResource;
-import org.apache.roller.weblogger.pojos.ThemeTemplate;
-import org.apache.roller.weblogger.pojos.WeblogTemplate;
-import org.apache.roller.weblogger.pojos.WeblogTheme;
-import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.MediaFile;
+import org.apache.roller.weblogger.pojos.*;
 import org.apache.roller.weblogger.util.RollerMessages;
 
 /**
  * Base implementation of a ThemeManager.
- * 
- * This particular implementation reads theme data off the filesystem 
+ *
+ * This particular implementation reads theme data off the filesystem
  * and assumes that those themes are not changable at runtime.
  */
 @com.google.inject.Singleton
@@ -77,11 +67,17 @@ public class ThemeManagerImpl implements
     // the Map contains ... (theme id, Theme)
     private Map themes = null;
 
+    // list of available types for templates
+    private static ArrayList<String> typeList = new ArrayList<String>();
+
     @com.google.inject.Inject
     protected ThemeManagerImpl(Weblogger roller) {
 
         this.roller = roller;
 
+        //set the available types that can be used for templates
+        this.addAvailableTypes();
+
         // get theme directory from config and verify it
         this.themeDir = WebloggerConfig.getProperty("themes.dir");
         if (themeDir == null || themeDir.trim().length() < 1) {
@@ -102,13 +98,13 @@ public class ThemeManagerImpl implements
         }
     }
 
-    public void initialize() throws InitializationException {
+     public void initialize() throws InitializationException {
 
         log.debug("Initializing Theme Manager");
 
         if (themeDir != null) {
             // rather than be lazy we are going to load all themes from
-            // the disk preemptively and cache them
+            // the disk preemptive and cache them
             this.themes = loadAllThemesFromDisk();
 
             log.info("Loaded " + this.themes.size() + " themes from disk.");
@@ -191,7 +187,7 @@ public class ThemeManagerImpl implements
 
         WeblogManager wmgr = roller.getWeblogManager();
         MediaFileManager fileMgr = roller.getMediaFileManager();
-        
+
         MediaFileDirectory root = fileMgr.getMediaFileRootDirectory(website);
         log.warn("Weblog " + website.getHandle() + " does not have a root MediaFile directory");
 
@@ -245,6 +241,25 @@ public class ThemeManagerImpl implements
                 // save it
                 wmgr.savePage(template);
             }
+             // creating template codes
+            for (String type : ThemeManagerImpl.getTypesList()) {
+                WeblogTemplateCode templateCode = template.getTemplateCode(type);
+                // if there are no template codes create it
+                if (templateCode == null) {
+                    WeblogTemplateCode themeTemplateCode = themeTemplate.getTemplateCode(type);
+
+                    if(themeTemplateCode== null){
+                        throw new WebloggerException("No templateCode found for template :"+themeTemplate.getId()+
+                                " of type :" +type);
+                    }
+                    templateCode = new WeblogTemplateCode(template.getId(), type);
+                    templateCode.setTemplate(themeTemplateCode.getTemplate());
+                    templateCode.setTemplateLanguage(themeTemplateCode.getTemplateLanguage());
+
+                    WebloggerFactory.getWeblogger().getWeblogManager().saveTemplateCode(templateCode);
+                }
+            }
+
         }
 
         // now, see if the weblog has left over action templates that
@@ -302,7 +317,7 @@ public class ThemeManagerImpl implements
                     mdir = fileMgr.getMediaFileRootDirectory(website);
                     justPath = "";
                     justName = resourcePath;
-                    
+
                 } else {
                     justPath = resourcePath.substring(0, resourcePath.lastIndexOf("/"));
                     if (!justPath.startsWith("/")) justPath = "/" + justPath;
@@ -317,7 +332,7 @@ public class ThemeManagerImpl implements
 
                 MediaFile oldmf = fileMgr.getMediaFileByOriginalPath(website, justPath + "/" + justName);
                 if (oldmf != null) {
-                    fileMgr.removeMediaFile(website, oldmf); 
+                    fileMgr.removeMediaFile(website, oldmf);
                 }
 
                 // save file without file-type, quota checks, etc.
@@ -327,7 +342,7 @@ public class ThemeManagerImpl implements
                 mf.setWeblog(website);
                 mf.setName(justName);
                 mf.setOriginalPath(justPath + "/" + justName);
-                mf.setContentType(map.getContentType(justName)); 
+                mf.setContentType(map.getContentType(justName));
                 mf.setInputStream(is);
                 mf.setLength(resource.getLength());
 
@@ -423,4 +438,15 @@ public class ThemeManagerImpl implements
         return reloaded;
 
     }
+
+    private void addAvailableTypes(){
+        this.getTypesList().add("standard");
+        this.getTypesList().add("mobile");
+    }
+
+    public static ArrayList<String> getTypesList() {
+          return typeList;
+      }
+
+
 }

Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadata.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadata.java?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadata.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadata.java Sat Sep 17 22:00:34 2011
@@ -30,6 +30,7 @@ public class ThemeMetadata {
     private String id = null;
     private String name = null;
     private String author = null;
+    private String type = null;
     private String previewImage = null;
     private ThemeMetadataTemplate stylesheet = null;
     private Set templates = new HashSet();
@@ -103,5 +104,12 @@ public class ThemeMetadata {
     public void setStylesheet(ThemeMetadataTemplate stylesheet) {
         this.stylesheet = stylesheet;
     }
-    
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 }



Mime
View raw message