You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2008/06/28 21:18:57 UTC
svn commit: r672574 [1/16] - in /roller/planet/core/trunk: ./ lib/
lib/buildtime/ lib/jakarta-taglibs-standard-1.1.2/
lib/jakarta-taglibs-standard-1.1.2/lib/
lib/jakarta-taglibs-standard-1.1.2/tld/ lib/openjpa-0.9.7/ lib/rome-0.9/
lib/spring-1.2/ lib/s...
Author: agilliland
Date: Sat Jun 28 12:18:17 2008
New Revision: 672574
URL: http://svn.apache.org/viewvc?rev=672574&view=rev
Log:
major overhaul to Roller Planet code to make it into a standalone project.
Added:
roller/planet/core/trunk/lib/
roller/planet/core/trunk/lib/buildtime/
roller/planet/core/trunk/lib/buildtime/activation.jar (with props)
roller/planet/core/trunk/lib/buildtime/commons-httpclient-2.0.2.jar (with props)
roller/planet/core/trunk/lib/buildtime/junit-4.1.jar (with props)
roller/planet/core/trunk/lib/buildtime/mail.jar (with props)
roller/planet/core/trunk/lib/buildtime/servlet-api.jar (with props)
roller/planet/core/trunk/lib/commons-codec-1.3.jar (with props)
roller/planet/core/trunk/lib/commons-collections-3.2.jar (with props)
roller/planet/core/trunk/lib/commons-digester-1.6.jar (with props)
roller/planet/core/trunk/lib/commons-lang-2.1.jar (with props)
roller/planet/core/trunk/lib/commons-logging-1.0.4.jar (with props)
roller/planet/core/trunk/lib/guice-1.0.jar (with props)
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/LICENSE
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/NOTICE
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/README
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/lib/
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/lib/jstl.jar (with props)
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/lib/serializer.jar (with props)
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/lib/standard.jar (with props)
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/lib/xalan.jar (with props)
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/tld/
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/tld/c-1_0-rt.tld
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/tld/c-1_0.tld
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/tld/c.tld
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/tld/fmt-1_0-rt.tld
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/tld/fmt-1_0.tld
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/tld/fmt.tld
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/tld/fn.tld
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/tld/permittedTaglibs.tld
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/tld/scriptfree.tld
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/tld/sql-1_0-rt.tld
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/tld/sql-1_0.tld
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/tld/sql.tld
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/tld/x-1_0-rt.tld
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/tld/x-1_0.tld
roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/tld/x.tld
roller/planet/core/trunk/lib/log4j-1.2.11.jar (with props)
roller/planet/core/trunk/lib/openjpa-0.9.7/
roller/planet/core/trunk/lib/openjpa-0.9.7/geronimo-j2ee-connector_1.5_spec-1.0.1.jar (with props)
roller/planet/core/trunk/lib/openjpa-0.9.7/geronimo-jpa_3.0_spec-1.0.jar (with props)
roller/planet/core/trunk/lib/openjpa-0.9.7/geronimo-jta_1.0.1B_spec-1.0.1.jar (with props)
roller/planet/core/trunk/lib/openjpa-0.9.7/openjpa-0.9.7-incubating.jar (with props)
roller/planet/core/trunk/lib/openjpa-0.9.7/serp-1.11.0.jar (with props)
roller/planet/core/trunk/lib/rome-0.9/
roller/planet/core/trunk/lib/rome-0.9/jdom.jar (with props)
roller/planet/core/trunk/lib/rome-0.9/rome-0.9.jar (with props)
roller/planet/core/trunk/lib/rome-0.9/rome-fetcher-0.9.jar (with props)
roller/planet/core/trunk/lib/spring-1.2/
roller/planet/core/trunk/lib/spring-1.2/acegi-security-1.0.3.jar (with props)
roller/planet/core/trunk/lib/spring-1.2/ehcache-1.1.jar (with props)
roller/planet/core/trunk/lib/spring-1.2/spring.jar (with props)
roller/planet/core/trunk/lib/struts-2.0.11.1/
roller/planet/core/trunk/lib/struts-2.0.11.1/lib/
roller/planet/core/trunk/lib/struts-2.0.11.1/lib/antlr-2.7.2.jar (with props)
roller/planet/core/trunk/lib/struts-2.0.11.1/lib/commons-beanutils-1.6.jar (with props)
roller/planet/core/trunk/lib/struts-2.0.11.1/lib/commons-chain-1.1.jar (with props)
roller/planet/core/trunk/lib/struts-2.0.11.1/lib/commons-fileupload-1.2.jar (with props)
roller/planet/core/trunk/lib/struts-2.0.11.1/lib/commons-io-1.3.1.jar (with props)
roller/planet/core/trunk/lib/struts-2.0.11.1/lib/commons-validator-1.3.0.jar (with props)
roller/planet/core/trunk/lib/struts-2.0.11.1/lib/freemarker-2.3.8.jar (with props)
roller/planet/core/trunk/lib/struts-2.0.11.1/lib/ognl-2.6.11.jar (with props)
roller/planet/core/trunk/lib/struts-2.0.11.1/lib/oro-2.0.8.jar (with props)
roller/planet/core/trunk/lib/struts-2.0.11.1/lib/struts2-core-2.0.11.jar (with props)
roller/planet/core/trunk/lib/struts-2.0.11.1/lib/struts2-spring-plugin-2.0.11.jar (with props)
roller/planet/core/trunk/lib/struts-2.0.11.1/lib/struts2-tiles-plugin-2.0.11.jar (with props)
roller/planet/core/trunk/lib/struts-2.0.11.1/lib/tiles-api-2.0.4.jar (with props)
roller/planet/core/trunk/lib/struts-2.0.11.1/lib/tiles-core-2.0.4.jar (with props)
roller/planet/core/trunk/lib/struts-2.0.11.1/lib/tiles-jsp-2.0.4.jar (with props)
roller/planet/core/trunk/lib/struts-2.0.11.1/lib/xwork-2.0.4.jar (with props)
roller/planet/core/trunk/lib/velocity-1.5.jar (with props)
roller/planet/core/trunk/setup/
roller/planet/core/trunk/setup/scripts/
roller/planet/core/trunk/setup/scripts/planet-custom.properties
roller/planet/core/trunk/setup/scripts/purgesubs.sh (with props)
roller/planet/core/trunk/setup/scripts/refreshplanet.sh (with props)
roller/planet/core/trunk/setup/sql/
roller/planet/core/trunk/setup/sql/0.4.0-create.sql
roller/planet/core/trunk/setup/sql/0.4.4-to-0.4.5.sql
roller/planet/core/trunk/setup/sql/droptables.sql
roller/planet/core/trunk/src/java/application.properties
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/Aggregator.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/AggregatorFactory.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/AggregatorLifecycleAware.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/AggregatorProvider.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/GuiceAggregatorProvider.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/MailProvider.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/PersistenceLifecycleAware.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/PlanetPersistenceException.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/UserManager.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/jpa/GuiceJPAAggregatorModule.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/jpa/JPAAggregatorImpl.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/jpa/JPAUserManagerImpl.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/config/planet-default.properties
roller/planet/core/trunk/src/java/org/apache/roller/planet/pojos/PlanetPermission.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/pojos/PlanetPermission.orm.xml
roller/planet/core/trunk/src/java/org/apache/roller/planet/pojos/User.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/pojos/User.orm.xml
roller/planet/core/trunk/src/java/org/apache/roller/planet/pojos/UserRole.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/pojos/UserRole.orm.xml
roller/planet/core/trunk/src/java/org/apache/roller/planet/tasks/PurgeUnusedSubscriptionsTask.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/core/filters/CharEncodingFilter.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/core/filters/SchemeEnforcementFilter.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/core/security/
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/core/security/RollerUserDetailsService.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/model/RequestContextModel.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/util/HomepageRequest.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/util/cache/
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/util/cache/FeedCache.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/util/cache/PageCache.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/admin/
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/admin/CreateUser.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/admin/CreateUserBean.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/admin/GlobalConfig.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/admin/ModifyUser.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/admin/UserAdmin.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/admin/package.properties
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/ajax/
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/ajax/UserDataServlet.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/core/
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/core/CreatePlanet-validation.xml
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/core/CreatePlanet.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/core/CreatePlanetBean.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/core/Login.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/core/MainMenu.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/core/Profile-validation.xml
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/core/Profile.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/core/ProfileBean.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/core/Register-validation.xml
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/core/Register.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/core/Setup.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/core/package.properties
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/editor/
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/editor/GroupAdd-validation.xml
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/editor/GroupAdd.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/editor/GroupBean.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/editor/GroupEdit-validation.xml
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/editor/GroupEdit.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/editor/GroupRemove.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/editor/Groups.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/editor/Members.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/editor/PlanetConfig-validation.xml
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/editor/PlanetConfig.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/editor/PlanetConfigBean.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/editor/PlanetRemove.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/editor/Subscriptions.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/editor/package.properties
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/util/
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/util/KeyValueObject.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/util/UIAction.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/util/UIActionInterceptor.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/util/UIActionPreparable.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/util/UIActionPrepareInterceptor.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/util/UISecurityEnforced.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/util/UISecurityInterceptor.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/struts2/util/UIUtils.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/util/DateUtil.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/util/RegexUtil.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/util/UUIDGenerator.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/util/cache/
roller/planet/core/trunk/src/java/org/apache/roller/planet/util/cache/Cache.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/util/cache/CacheFactory.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/util/cache/CacheHandler.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/util/cache/CacheManager.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/util/cache/CachedContent.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/util/cache/ExpiringCacheEntry.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/util/cache/ExpiringLRUCacheFactoryImpl.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/util/cache/ExpiringLRUCacheImpl.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/util/cache/LRUCacheFactoryImpl.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/util/cache/LRUCacheImpl.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/util/cache/LazyExpiringCacheEntry.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/util/mail/
roller/planet/core/trunk/src/java/org/apache/roller/planet/util/mail/MailResources.properties
roller/planet/core/trunk/src/java/org/apache/roller/planet/util/mail/PlanetMailer.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/util/mail/PlanetMailerException.java
roller/planet/core/trunk/test/conf/
roller/planet/core/trunk/test/conf/JPAEMF.properties
roller/planet/core/trunk/test/conf/commons-logging.properties
roller/planet/core/trunk/test/conf/log4j.properties
roller/planet/core/trunk/test/conf/planet.properties
roller/planet/core/trunk/test/java/org/apache/roller/planet/business/AbstractBusinessTestCase.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/business/DatabaseProviderTest.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/business/MailProviderTest.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/business/PermissionTest.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/business/UserTest.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/business/mock/
roller/planet/core/trunk/test/java/org/apache/roller/planet/business/mock/MockPlanetImpl.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/business/mock/MockPropertiesManagerImpl.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/config/
roller/planet/core/trunk/test/java/org/apache/roller/planet/config/PlanetConfigTest.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/config/custom.properties
roller/planet/core/trunk/test/java/org/apache/roller/planet/config/default.properties
roller/planet/core/trunk/test/java/org/apache/roller/planet/tasks/
roller/planet/core/trunk/test/java/org/apache/roller/planet/tasks/PurgeUnusedSubscriptionsTaskTest.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/ui/
roller/planet/core/trunk/test/java/org/apache/roller/planet/ui/rendering/
roller/planet/core/trunk/test/java/org/apache/roller/planet/ui/rendering/util/
roller/planet/core/trunk/test/java/org/apache/roller/planet/ui/rendering/util/PlanetGroupFeedRequestTest.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/ui/rendering/util/PlanetGroupPageRequestTest.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/ui/rendering/util/PlanetGroupRequestTest.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/ui/struts2/
roller/planet/core/trunk/test/java/org/apache/roller/planet/ui/struts2/core/
roller/planet/core/trunk/test/java/org/apache/roller/planet/ui/struts2/core/CreatePlanetTest.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/ui/struts2/core/MainMenuTest.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/ui/struts2/editor/
roller/planet/core/trunk/test/java/org/apache/roller/planet/ui/struts2/editor/GroupAddTest.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/ui/struts2/editor/GroupBeanTest.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/ui/struts2/editor/GroupEditTest.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/ui/struts2/editor/GroupRemoveTest.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/ui/struts2/editor/MembersTest.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/ui/struts2/editor/PlanetConfigBeanTest.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/ui/struts2/editor/PlanetConfigTest.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/ui/struts2/editor/PlanetRemoveTest.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/ui/struts2/editor/SubscriptionsTest.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/util/mail/
roller/planet/core/trunk/test/java/org/apache/roller/planet/util/mail/PlanetMailerTest.java
roller/planet/core/trunk/test/java/org/apache/roller/util/
roller/planet/core/trunk/test/java/org/apache/roller/util/RegexUtilTest.java
roller/planet/core/trunk/test/java/org/apache/roller/util/UtilitiesTestSuite.java
roller/planet/core/trunk/web/WEB-INF/jsps/admin/CreateUser.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/admin/GlobalConfig.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/admin/ModifyUser.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/admin/UserAdmin.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/core/
roller/planet/core/trunk/web/WEB-INF/jsps/core/CreatePlanet.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/core/Login.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/core/MainMenu.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/core/Profile.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/core/Register.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/core/RegisterDisabled.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/core/Setup.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/core/Welcome.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/editor/
roller/planet/core/trunk/web/WEB-INF/jsps/editor/GroupAdd.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/editor/GroupEdit.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/editor/GroupRemove.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/editor/Groups.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/editor/Members.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/editor/PlanetConfig.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/editor/PlanetRemove.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/editor/Subscriptions.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/errors/
roller/planet/core/trunk/web/WEB-INF/jsps/errors/403.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/errors/404.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/errors/denied.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/errors/error.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/taglibs-struts2.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/tiles/
roller/planet/core/trunk/web/WEB-INF/jsps/tiles/empty.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/tiles/footer.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/tiles/head.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/tiles/menubar.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/tiles/messages.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/tiles/tiles-simplepage.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/tiles/title.jsp
roller/planet/core/trunk/web/WEB-INF/security.xml
roller/planet/core/trunk/web/WEB-INF/tiles.xml
roller/planet/core/trunk/web/planet-ui/css/planet-ui.css
roller/planet/core/trunk/web/planet-ui/images/cog.png (with props)
roller/planet/core/trunk/web/planet-ui/images/table_multiple.png (with props)
roller/planet/core/trunk/web/planet-ui/images/world_go.png (with props)
roller/planet/core/trunk/web/planet-ui/login-redirect.jsp
roller/planet/core/trunk/web/planet-ui/logout-redirect.jsp
roller/planet/core/trunk/web/planet-ui/scripts/
roller/planet/core/trunk/web/planet-ui/scripts/ajax-user.js
roller/planet/core/trunk/web/planet-ui/scripts/scriptaculous/
roller/planet/core/trunk/web/planet-ui/scripts/scriptaculous/builder.js
roller/planet/core/trunk/web/planet-ui/scripts/scriptaculous/controls.js
roller/planet/core/trunk/web/planet-ui/scripts/scriptaculous/dragdrop.js
roller/planet/core/trunk/web/planet-ui/scripts/scriptaculous/effects.js
roller/planet/core/trunk/web/planet-ui/scripts/scriptaculous/prototype.js
roller/planet/core/trunk/web/planet-ui/scripts/scriptaculous/scriptaculous.js
roller/planet/core/trunk/web/planet-ui/scripts/scriptaculous/slider.js
roller/planet/core/trunk/web/robots.txt
Removed:
roller/planet/core/trunk/src/java/META-INF/planet-hibernate.cfg.xml
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/GuicePlanetProvider.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/Manager.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/Planet.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/PlanetFactory.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/PlanetProvider.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/jpa/JPAPlanetImpl.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/jpa/JPAPlanetModule.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/config/PlanetRuntimeConfig.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/config/planet.properties
roller/planet/core/trunk/src/java/org/apache/roller/planet/pojos/Planet.hbm.xml
roller/planet/core/trunk/src/java/org/apache/roller/planet/pojos/PlanetGroup.hbm.xml
roller/planet/core/trunk/src/java/org/apache/roller/planet/pojos/RuntimeConfigProperty.hbm.xml
roller/planet/core/trunk/src/java/org/apache/roller/planet/pojos/Subscription.hbm.xml
roller/planet/core/trunk/src/java/org/apache/roller/planet/pojos/SubscriptionEntry.hbm.xml
roller/planet/core/trunk/src/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/tasks/StaticPlanetModel.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/tasks/TechnoratiRankingsTask.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/admin/struts2/ConfigForm.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetForm-PlanetForm!save-validation.xml
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetForm.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm-PlanetGroupForm!save-validation.xml
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetSubscriptionForm-PlanetSubscriptionForm!save-validation.xml
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetSubscriptionForm.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetsList.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/admin/struts2/package.properties
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/core/filters/DebugFilter.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/core/struts2/Login.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/core/struts2/Logout.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/core/struts2/MainMenu.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/core/struts2/PlanetActionSupport.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/core/struts2/package.properties
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/util/PlanetRequest.java
roller/planet/core/trunk/src/java/org/apache/roller/util/OldUtilities.java
roller/planet/core/trunk/src/java/org/apache/roller/util/StandaloneWebappClassLoader.java
roller/planet/core/trunk/src/java/org/apache/roller/util/TaskRunner.java
roller/planet/core/trunk/src/java/org/apache/roller/util/UtilitiesModel.java
roller/planet/core/trunk/test/java/org/apache/roller/ant/StartDerbyTask.java
roller/planet/core/trunk/test/java/org/apache/roller/ant/StopDerbyTask.java
roller/planet/core/trunk/web/WEB-INF/applicationContext.xml
roller/planet/core/trunk/web/WEB-INF/jsps/MainMenu.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/admin/ConfigForm.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/admin/PlanetForm.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/admin/PlanetsList.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/admin/menu.jsp
roller/planet/core/trunk/web/WEB-INF/jsps/admin/statusMessage.jsp
roller/planet/core/trunk/web/planet-ui/css/planet.css
Modified:
roller/planet/core/trunk/ (props changed)
roller/planet/core/trunk/build.properties
roller/planet/core/trunk/build.xml
roller/planet/core/trunk/src/java/META-INF/persistence.xml
roller/planet/core/trunk/src/java/org/apache/roller/planet/PlanetException.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/AbstractManagerImpl.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/DatabaseProvider.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/MultiPlanetURLStrategy.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/PlanetManager.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/PropertiesManager.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/fetcher/RomeFeedFetcher.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/jpa/JPAPersistenceStrategy.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/jpa/JPAPropertiesManagerImpl.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/startup/PlanetStartup.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/business/updater/SingleThreadedFeedUpdater.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/config/PlanetConfig.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/config/planetRuntimeConfigDefs.xml
roller/planet/core/trunk/src/java/org/apache/roller/planet/pojos/Planet.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/pojos/Planet.orm.xml
roller/planet/core/trunk/src/java/org/apache/roller/planet/pojos/PlanetGroup.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/pojos/Subscription.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/pojos/Subscription.orm.xml
roller/planet/core/trunk/src/java/org/apache/roller/planet/pojos/SubscriptionEntry.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/tasks/PlanetTask.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/tasks/RefreshPlanetTask.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/core/PlanetContext.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/core/filters/PersistenceSessionFilter.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/MultiPlanetRequestMapper.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/RendererManager.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/filters/RequestMappingFilter.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/model/FeedModel.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/model/PageModel.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/model/PlanetGroupModel.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/model/PlanetURLModel.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/model/SiteModel.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/model/SiteURLModel.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/model/UtilitiesModel.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/pagers/PlanetEntriesPager.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/servlets/FeedServlet.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/servlets/HomepageServlet.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/servlets/OpmlServlet.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/servlets/PageServlet.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/util/ParsedRequest.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/util/PlanetGroupFeedRequest.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/util/PlanetGroupOpmlRequest.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/util/PlanetGroupPageRequest.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/util/PlanetGroupRequest.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/ui/rendering/velocity/TemplateResourceLoader.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/util/MailUtil.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/util/URLUtilities.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/util/Utilities.java
roller/planet/core/trunk/src/java/org/apache/roller/planet/util/rome/DiskFeedInfoCache.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/TestUtils.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/business/EntryBasicTests.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/business/EntryFunctionalTests.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/business/GroupBasicTests.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/business/GroupFunctionalTests.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/business/PlanetBasicTests.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/business/PlanetFunctionalTests.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/business/PlanetTestSuite.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/business/PropertiesTest.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/business/SubscriptionBasicTests.java
roller/planet/core/trunk/test/java/org/apache/roller/planet/business/SubscriptionFunctionalTests.java
roller/planet/core/trunk/web/WEB-INF/classes/log4j.properties
roller/planet/core/trunk/web/WEB-INF/classes/struts.properties
roller/planet/core/trunk/web/WEB-INF/classes/struts.xml
roller/planet/core/trunk/web/WEB-INF/jsps/login.jsp
roller/planet/core/trunk/web/WEB-INF/web.xml
roller/planet/core/trunk/web/planet-ui/index.jsp
Propchange: roller/planet/core/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jun 28 12:18:17 2008
@@ -1,2 +1,3 @@
-dist
+nbproject
build
+dist
Modified: roller/planet/core/trunk/build.properties
URL: http://svn.apache.org/viewvc/roller/planet/core/trunk/build.properties?rev=672574&r1=672573&r2=672574&view=diff
==============================================================================
--- roller/planet/core/trunk/build.properties (original)
+++ roller/planet/core/trunk/build.properties Sat Jun 28 12:18:17 2008
@@ -1,38 +1,8 @@
-# compile properties
-build.debug=true
-build.sourcelevel=1.5
-build.deprecation=false
-
-
-# automated testing contorls
-junit.fork=true
-junit.haltonerror=true
-
-# customizable pre and post testing ant tasks. ordering is ...
-# startTask, initTask, unit tests run, stopTask
-test.db.startTask=start-db
-test.db.initTask=init-db
-test.db.stopTask=stop-db
-
-# define what db to use for testing. default is derby.
-# NOTE: you must also apply these settings in testdata/planet-custom.properties
-test.db.name=derby
-test.db.cpath=${basedir}/../../tools/buildtime/derbyclient.jar
-test.db.driver=org.apache.derby.jdbc.ClientDriver
-test.db.url=jdbc:derby://localhost:3219/planet;create=true
-test.db.username=app
-test.db.password=app
-
# example settings for running tests against a mysql database
-# NOTE: you must also apply these settings in testdata/roller-custom.properties
-#test.db.startTask=nothing
-#test.db.initTask=init-db
-#test.db.stopTask=nothing
-#test.db.name=mysql
-#test.db.cpath=/Users/dave/tomcat/common/lib/mysql-connector-java-3.1.14-bin.jar
-#test.db.driver=com.mysql.jdbc.Driver
-#test.db.url=jdbc:mysql://localhost/rollertest
-#test.db.username=scott
-#test.db.password=tiger
-
+# NOTE: you must also apply these settings in test/conf/planet.properties
+test.db.cpath=/export/java/mysql-connector-java-3.0.14-production/mysql-connector-java-3.0.14-production-bin.jar
+test.db.driver=com.mysql.jdbc.Driver
+test.db.url=jdbc:mysql://localhost/test_planet
+test.db.username=roller
+test.db.password=roller
Modified: roller/planet/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/roller/planet/core/trunk/build.xml?rev=672574&r1=672573&r2=672574&view=diff
==============================================================================
--- roller/planet/core/trunk/build.xml (original)
+++ roller/planet/core/trunk/build.xml Sat Jun 28 12:18:17 2008
@@ -16,84 +16,62 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<!DOCTYPE project [
-<!ENTITY custom-build SYSTEM "custom/custom-build.xmlf">
-<!ENTITY custom-dist SYSTEM "custom/custom-dist.xmlf">
-]>
+
<project name="Roller Planet" default="build" basedir=".">
<description>Builds, tests, and runs the project Roller Planet.</description>
<property file="build.properties" />
- <!-- a pointer to the root of the entire Roller workspace -->
- <property name="root" value="${basedir}/../.." />
-
<!-- core properties -->
<property name="build" value="${basedir}/build" />
<property name="dist" value="${basedir}/dist" />
<property name="lib" value="${basedir}/lib" />
- <property name="sql" value="${basedir}/src/sql" />
+ <property name="sql" value="${basedir}/setup/sql" />
<property name="src" value="${basedir}/src/java" />
- <property name="tools" value="${basedir}/../../tools" />
<property name="test" value="${basedir}/test/java" />
- <property name="testcontext" value="${basedir}/build/test/testcontext" />
<property name="web" value="${basedir}/web" />
+ <!-- compile and test properties -->
+ <property name="app.version" value="0.4.5" />
+ <property name="build.debug" value="true" />
+ <property name="build.sourcelevel" value="1.5" />
+ <property name="build.deprecation" value="false" />
+ <property name="junit.fork" value="true" />
+ <property name="junit.haltonerror" value="true" />
+
<!-- build properties -->
<property name="build.compile" value="${build}/compile"/>
<property name="build.compile.business" value="${build.compile}/business"/>
<property name="build.compile.web" value="${build.compile}/web"/>
- <property name="build.compile.custom" value="${build.compile}/custom"/>
<property name="build.compile.test" value="${build.compile}/test"/>
- <property name="build.lib" value="${build}/lib"/>
- <property name="build.webapp" value="${build}/webapp"/>
- <property name="build.dbscripts" value="${build}/dbscripts"/>
- <property name="build.test" value="${build}/test"/>
- <property name="build.test.reports" value="${build.test}/reports"/>
-
- <fileset id="business.tools" dir="${tools}" >
-
- <!-- Roller Core -->
- <include name="roller-core/roller-core.jar"/>
- <include name="lib/commons-id-0.1-SNAPSHOT.jar"/>
-
+ <property name="build.lib" value="${build}/lib"/>
+ <property name="build.webapp" value="${build}/webapp"/>
+ <property name="build.test" value="${build}/test"/>
+ <property name="build.testcontext" value="${build.test}/testcontext" />
+ <property name="build.test.reports" value="${build.test}/reports"/>
+
+ <fileset id="business.tools" dir="${lib}" >
<!-- General dependencies -->
- <include name="lib/guice-1.0.jar"/>
- <include name="lib/log4j-1.2.11.jar"/>
- <include name="lib/commons-codec-1.3.jar"/>
- <include name="lib/commons-collections-3.2.jar"/>
- <include name="lib/commons-digester-1.6.jar"/>
- <include name="lib/commons-lang-2.1.jar"/>
- <include name="lib/commons-logging-1.0.4.jar"/>
- <include name="buildtime/activation.jar"/>
- <include name="buildtime/mail.jar"/>
-
+ <include name="guice-1.0.jar"/>
+ <include name="log4j-1.2.11.jar"/>
+ <include name="commons-codec-1.3.jar"/>
+ <include name="commons-collections-3.2.jar"/>
+ <include name="commons-digester-1.6.jar"/>
+ <include name="commons-lang-2.1.jar"/>
+ <include name="commons-logging-1.0.4.jar"/>
+
<!-- needed for JPA/OpenJPA -->
- <include name="openjpa-0.9.7/openjpa-0.9.7-incubating.jar"/>
- <include name="openjpa-0.9.7/geronimo-jpa_3.0_spec-1.0.jar"/>
- <include name="openjpa-0.9.7/geronimo-jta_1.0.1B_spec-1.0.1.jar"/>
- <include name="openjpa-0.9.7/serp-1.11.0.jar"/>
- <include name="openjpa-0.9.7/geronimo-j2ee-connector_1.5_spec-1.0.1.jar"/>
-<!--
- <include name="openjpa-1.0/geronimo-jpa_3.0_spec-1.0.jar"/>
- <include name="openjpa-1.0/geronimo-jta_1.1_spec-1.1.jar"/>
- <include name="openjpa-1.0/openjpa-1.0.0.jar"/>
- <include name="openjpa-1.0/serp-1.13.1.jar"/>
--->
- <!-- Needed for JPA/Toplink
- <include name="toplink-essentials-9.1/toplink-essentials.jar"/> -->
+ <include name="openjpa-0.9.7/*.jar"/>
<!-- needed for ROME -->
- <include name="lib/rome-0.9.1-dev.jar"/>
- <include name="lib/rome-fetcher-0.9.jar"/>
- <include name="lib/jdom.jar"/>
+ <include name="rome-0.9/*.jar"/>
<!-- Velocity -->
- <include name="lib/velocity-1.5.jar"/>
+ <include name="velocity-1.5.jar"/>
</fileset>
- <fileset id="web.tools" dir="${tools}">
+ <fileset id="web.tools" dir="${lib}">
<!-- Jstl -->
<include name="jakarta-taglibs-standard-1.1.2/lib/jstl.jar" />
<include name="jakarta-taglibs-standard-1.1.2/lib/standard.jar" />
@@ -101,21 +79,27 @@
<include name="jakarta-taglibs-standard-1.1.2/lib/serializer.jar" />
<!-- Struts 2 -->
- <include name="struts-2.0.9/lib/*.jar"/>
+ <include name="struts-2.0.11.1/lib/*.jar"/>
- <!-- Struts 2 depends on Spring -->
- <include name="spring-2.5/spring-2.5.4.jar"/>
+ <!-- Spring & Acegi -->
+ <include name="spring-1.2/*.jar"/>
</fileset>
+ <fileset id="buildtime.tools" dir="${lib}" >
+ <include name="buildtime/*.jar" />
+ </fileset>
+
+
+ <path id="planet.buildtime.path">
+ <fileset refid="buildtime.tools" />
+ </path>
+
<path id="planet.business.path">
<fileset refid="business.tools" />
</path>
<path id="planet.web.path">
<fileset refid="web.tools" />
-
- <!-- need servlet api for build time -->
- <pathelement location="${tools}/buildtime/tomcat-5.0.28/servlet-api.jar" />
<!-- planet business layer classpath -->
<path refid="planet.business.path" />
@@ -124,24 +108,7 @@
<pathelement location="${build.lib}/roller-planet-business.jar"/>
</path>
- <path id="xdoclet.path">
- <path refid="planet.web.path"/>
-
- <fileset dir="${tools}/buildtime" includes="ejb-1.1.jar"/>
- <fileset dir="${tools}/buildtime/xdoclet-1.2.3/lib" includes="*.jar"/>
- </path>
-
<path id="test.path">
- <!-- testing jars -->
- <fileset dir="${tools}/buildtime/mockrunner-0.35/lib">
- <include name="*.jar"/>
- </fileset>
- <pathelement location="${tools}/buildtime/junit-4.1.jar"/>
- <pathelement location="${tools}/buildtime/ant-1.7.0/ant-junit.jar"/>
- <pathelement location="${tools}/buildtime/derby.jar"/>
- <pathelement location="${tools}/buildtime/derbyclient.jar"/>
- <pathelement location="${tools}/buildtime/derbynet.jar"/>
- <pathelement location="${tools}/lib/commons-httpclient-2.0.2.jar"/>
<!-- plus normal jars -->
<path refid="planet.web.path"/>
@@ -161,7 +128,7 @@
<!-- ============================================== -->
<!-- build all code -->
- <target name="build" depends="build-business, build-web, build-custom" >
+ <target name="build" depends="build-business, build-web, build-tests, dist" >
</target>
<!-- build the business layer code and jar it up -->
@@ -179,6 +146,7 @@
<classpath>
<path refid="planet.business.path"/>
+ <path refid="planet.buildtime.path"/>
</classpath>
</javac>
@@ -198,6 +166,7 @@
<!-- OpenJPA bytecode enhancement -->
<path id="openjpac.path">
<path refid="planet.business.path"/>
+ <path refid="planet.buildtime.path"/>
<pathelement path="${build.compile.business}" />
<pathelement path="${build.compile.business}/org/apache/roller/planet/pojos" />
</path>
@@ -210,16 +179,6 @@
<classpath refid="openjpac.path" />
</openjpac>
- <!-- JPA/Toplink bytecode enhancement
- <taskdef name="weave" classname="oracle.toplink.essentials.weaving.StaticWeaveAntTask" classpathref="planet.business.path"/>
- <weave source="${build.compile.business}" target="${build.compile.business}">
- <classpath>
- <path refid="planet.business.path"/>
- <pathelement location="${build.compile.business}" />
- <pathelement location="${build.compile.business}/org/apache/roller/planet/pojos" />
- </classpath>
- </weave> -->
-
<!-- Jar up the business layer -->
<mkdir dir="${build.lib}"/>
<jar basedir="${build.compile.business}"
@@ -243,6 +202,7 @@
<classpath>
<path refid="planet.web.path"/>
+ <path refid="planet.buildtime.path"/>
</classpath>
</javac>
@@ -264,17 +224,43 @@
</target>
- <!-- build custom code and jar it up -->
- <target name="build-custom" depends="build-web">
+ <!-- ============================================== -->
+ <!-- build code used for unit testing -->
+ <target name="build-tests" depends="build-web" description="Build unit tests">
+
+ <!-- compile all test classes -->
+ <mkdir dir="${build.compile.test}" />
+ <javac destdir="${build.compile.test}"
+ includeantruntime="false"
+ debug="${build.debug}"
+ source="${build.sourcelevel}"
+ deprecation="${build.deprectation}">
+
+ <src path="${test}" />
+
+ <classpath>
+ <path refid="test.path"/>
+ <path refid="planet.buildtime.path"/>
+ </classpath>
+ </javac>
+
+ <mkdir dir="${build.testcontext}" />
+ <copy todir="${build.testcontext}">
+ <fileset dir="${web}" excludes="**/jsps/**,**/velocity/**" />
+ <fileset dir="${basedir}/test/conf" />
+ </copy>
- &custom-build;
+ <!-- Copy test resources -->
+ <copy todir="${build.compile.test}">
+ <fileset dir="${test}" excludes="**/*.java, **/*.html, **/*.png" />
+ </copy>
</target>
<!-- ============================================== -->
<!-- create distributable components -->
- <target name="dist" depends="build" description="Create Roller Planet distributables">
+ <target name="dist" depends="build-tests" description="Create Roller Planet distributables">
<!-- distributable libraries -->
<mkdir dir="${dist}/lib" />
@@ -297,135 +283,69 @@
<copy todir="${build.webapp}">
<fileset dir="${web}" includes="**/**" />
- </copy>
- <chmod perm="+x" dir="${build.webapp}/WEB-INF/scripts" includes="*.sh" />
-
- <!-- allow for custom mods to webapp -->
- &custom-dist;
+ </copy>
<!-- distributable WAR file -->
<mkdir dir="${dist}/webapp" />
- <jar destfile="${dist}/webapp/roller-planet.war"
+ <jar destfile="${dist}/webapp/roller-planet-${app.version}.war"
basedir="${build.webapp}" />
</target>
- <!-- generate database scripts -->
- <target name="gen-dbscripts">
-
- <mkdir dir="${build.dbscripts}" />
-
- <!-- need a directory for each db to exist before generation can happen -->
- <mkdir dir="${build.dbscripts}/db2" />
- <mkdir dir="${build.dbscripts}/derby" />
- <mkdir dir="${build.dbscripts}/hsqldb" />
- <mkdir dir="${build.dbscripts}/mssql" />
- <mkdir dir="${build.dbscripts}/mysql" />
- <mkdir dir="${build.dbscripts}/oracle" />
- <mkdir dir="${build.dbscripts}/postgresql" />
-
- <path id="texen.path">
- <fileset refid="business.tools" />
- <pathelement location="${root}/metadata/database/" />
- <pathelement location="${sql}" />
- </path>
- <taskdef name="texen"
- classname="org.apache.velocity.texen.ant.TexenTask"
- classpathref="texen.path" />
-
- <texen
- controlTemplate="control.vm"
- contextProperties="${sql}/dbscripts.properties"
- useClasspath="true"
- outputDirectory="${build.dbscripts}"
- outputFile="README.txt" />
-
- <!-- just copy over the droptables script -->
- <copy todir="${build.dbscripts}" file="${sql}/droptables.sql" />
-
- </target>
-
-
- <!-- ============================================== -->
- <!-- build code used for unit testing -->
- <target name="build-tests" depends="build" description="Build unit tests">
-
- <mkdir dir="${build.test}/planetcache"/>
- <mkdir dir="${build.test}/planetoutput"/>
-
- <!-- compile all test classes -->
- <mkdir dir="${build.compile.test}" />
- <javac destdir="${build.compile.test}"
- includeantruntime="false"
- debug="${build.debug}"
- source="${build.sourcelevel}"
- deprecation="${build.deprectation}">
-
- <src path="${test}" />
-
- <classpath>
- <path refid="test.path"/>
- <pathelement location="${tools}/buildtime/ant-1.7.0/ant.jar"/>
- </classpath>
- </javac>
-
- <mkdir dir="${testcontext}" />
- <copy todir="${testcontext}">
- <fileset dir="${web}" excludes="**/jsps/**,**/velocity/**" />
- <fileset dir="${basedir}/testdata" />
- </copy>
-
- <!-- Copy test resources -->
- <copy todir="${build.compile.test}">
- <fileset dir="${test}" excludes="**/*.java, **/*.html, **/*.png" />
- </copy>
-
- </target>
-
-
- <target name="test" depends="build-tests" description="All tests">
+ <target name="test" depends="build" description="All tests">
<!-- business layer tests -->
<antcall target="test-business" />
- <!-- TODO: web layer tests -->
+ <!-- web layer tests -->
+ <antcall target="test-web" />
</target>
<!-- ===================================== -->
<!-- test planet business layer functionality -->
- <target name="test-business" depends="build-tests, gen-dbscripts" description="Back-end tests">
+ <target name="test-business" depends="build" description="Back-end tests">
<mkdir dir="${build.test.reports}/business/xml"/>
<mkdir dir="${build.test.reports}/business/html"/>
<!-- allow for startup and initialization of test db -->
- <antcall target="${test.db.startTask}" />
- <antcall target="${test.db.initTask}" />
+ <antcall target="init-db" />
- <junit dir="${build.test}" fork="${junit.fork}" printsummary="on" showOutput="true">
+ <junit dir="${build.test}" fork="${junit.fork}" haltonerror="${junit.haltonerror}" printsummary="on" showOutput="true">
+
+ <!-- needed to satisfy ref in log4j.properties -->
+ <jvmarg value="-Dcatalina.base=${build.test}"/>
+ <jvmarg value="-Dbuild=${build}"/>
+
<classpath>
<!-- testing jars -->
<path refid="test.path"/>
+ <path refid="planet.buildtime.path"/>
<!-- plus our compiled test classes -->
<pathelement location="${build.compile.test}"/>
<!-- testdata. the equivalent of /WEB-INF/classes in a webapp -->
- <pathelement location="${basedir}/build/test/testcontext" />
- <pathelement location="${basedir}/build/test/testcontext/WEB-INF/classes" />
+ <pathelement location="${build.testcontext}" />
+ <pathelement location="${build.testcontext}/WEB-INF/classes" />
<!-- plus the classpath for jars needed to talk to the test db -->
<pathelement path="${test.db.cpath}" />
</classpath>
- <!-- needed to satisfy ref in log4j.properties -->
- <jvmarg value="-Dcatalina.base=${build.test}"/>
- <jvmarg value="-Dbuild=${build}"/>
- <formatter type="xml"/>
- <batchtest toDir="${build.test.reports}/business/xml" haltonerror="${junit.haltonerror}">
+ <batchtest toDir="${build.test.reports}/business/xml">
+ <formatter type="xml"/>
<fileset dir="${build.compile.test}">
+ <include name="org/apache/roller/planet/config/PlanetConfigTest.class" />
+
+ <include name="org/apache/roller/planet/business/DatabaseProviderTest.class" />
+ <include name="org/apache/roller/planet/business/MailProviderTest.class" />
+
+ <include name="org/apache/roller/planet/util/mail/PlanetMailerTest.class" />
+
<include name="org/apache/roller/planet/business/PlanetTestSuite.class"/>
+ <include name="org/apache/roller/planet/tasks/PurgeUnusedSubscriptionsTaskTest.class" />
</fileset>
</batchtest>
</junit>
@@ -436,9 +356,70 @@
</fileset>
<report format="noframes" toDir="${build.test.reports}/business/html"/>
</junitreport>
+
+ </target>
+
+ <!-- ===================================== -->
+ <!-- test planet web layer functionality -->
+ <target name="test-web" depends="build" description="Front-end tests">
+
+ <mkdir dir="${build.test.reports}/web/xml"/>
+ <mkdir dir="${build.test.reports}/web/html"/>
+
+ <!-- allow for startup and initialization of test db -->
+ <antcall target="init-db" />
+
+ <junit dir="${build.test}" fork="${junit.fork}" haltonerror="${junit.haltonerror}" printsummary="on" showOutput="true">
+
+ <!-- needed to satisfy ref in log4j.properties -->
+ <jvmarg value="-Dcatalina.base=${build.test}"/>
+ <jvmarg value="-Dbuild=${build}"/>
+
+ <classpath>
+ <!-- testing jars -->
+ <path refid="test.path"/>
+ <path refid="planet.buildtime.path"/>
+
+ <!-- plus our compiled test classes -->
+ <pathelement location="${build.compile.test}"/>
+
+ <!-- testdata. the equivalent of /WEB-INF/classes in a webapp -->
+ <pathelement location="${build.testcontext}" />
+ <pathelement location="${build.testcontext}/WEB-INF/classes" />
+
+ <!-- plus the classpath for jars needed to talk to the test db -->
+ <pathelement path="${test.db.cpath}" />
+ </classpath>
+
+ <batchtest toDir="${build.test.reports}/web/xml">
+ <formatter type="xml"/>
+ <fileset dir="${build.compile.test}">
+ <include name="org/apache/roller/planet/ui/struts2/core/CreatePlanetTest.class" />
+ <include name="org/apache/roller/planet/ui/struts2/core/MainMenuTest.class" />
+
+ <include name="org/apache/roller/planet/ui/struts2/editor/PlanetConfigBeanTest.class" />
+ <include name="org/apache/roller/planet/ui/struts2/editor/PlanetConfigTest.class" />
+ <include name="org/apache/roller/planet/ui/struts2/editor/PlanetRemoveTest.class" />
+ <include name="org/apache/roller/planet/ui/struts2/editor/GroupBeanTest.class" />
+ <include name="org/apache/roller/planet/ui/struts2/editor/GroupAddTest.class" />
+ <include name="org/apache/roller/planet/ui/struts2/editor/GroupEditTest.class" />
+ <include name="org/apache/roller/planet/ui/struts2/editor/GroupRemoveTest.class" />
+ <include name="org/apache/roller/planet/ui/struts2/editor/MembersTest.class" />
+ <include name="org/apache/roller/planet/ui/struts2/editor/SubscriptionsTest.class" />
+
+ <include name="org/apache/roller/planet/ui/rendering/util/PlanetGroupRequestTest.class" />
+ <include name="org/apache/roller/planet/ui/rendering/util/PlanetGroupFeedRequestTest.class" />
+ <include name="org/apache/roller/planet/ui/rendering/util/PlanetGroupPageRequestTest.class" />
+ </fileset>
+ </batchtest>
+ </junit>
- <!-- allow for shutdown of test db -->
- <antcall target="${test.db.stopTask}" />
+ <junitreport todir="${build.test.reports}/web/xml">
+ <fileset dir="${build.test.reports}/web/xml">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <report format="noframes" toDir="${build.test.reports}/web/html"/>
+ </junitreport>
</target>
@@ -455,7 +436,7 @@
url="${test.db.url}"
userid="${test.db.username}"
password="${test.db.password}"
- src="${build.dbscripts}/droptables.sql"
+ src="${sql}/droptables.sql"
onerror="continue"
classpath="${test.db.cpath}" />
@@ -464,93 +445,18 @@
url="${test.db.url}"
userid="${test.db.username}"
password="${test.db.password}"
- src="${build.dbscripts}/${test.db.name}/createdb.sql"
+ src="${sql}/0.4.0-create.sql"
onerror="continue"
classpath="${test.db.cpath}" />
- </target>
-
- <target name="start-db" description="Starts built-in database">
- <taskdef name="startdb" classname="org.apache.roller.ant.StartDerbyTask"
- classpath="${tools}/buildtime/derby.jar;${tools}/buildtime/derbynet.jar;${build.compile.test}" />
- <startdb database="${build.test}/derby-system/roller" port="3219" />
- </target>
-
- <target name="stop-db" description="Stops built-in database">
- <taskdef name="stopdb" classname="org.apache.roller.ant.StopDerbyTask"
- classpath="${tools}/buildtime/derby.jar;${tools}/buildtime/derbynet.jar;${build.compile.test}" />
- <stopdb port="3219"/>
- </target>
-
- <target name="nothing">
- <!-- this task does nothing and is here so that
- dynamic task definitions have a no-op choice -->
- </target>
- <!-- Netbeans-only: debug single class -->
- <target name="debug-selected-files" if="netbeans.home" depends="build-tests"
- description="Debug a Single File">
- <fail unless="classname">Must set property 'classname'</fail>
- <antcall target="start-db" />
- <antcall target="init-db" />
- <nbjpdastart name="${classname}" addressproperty="jpda.address" transport="dt_socket">
- <classpath>
- <path refid="test.path"/>
- <pathelement location="${build.compile.test}"/>
- <pathelement location="${basedir}/testdata" />
- <pathelement path="${test.db.cpath}" />
- </classpath>
- </nbjpdastart>
- <java classname="${classname}" fork="true" dir="${build.test}">
- <jvmarg value="-Xdebug"/>
- <jvmarg value="-Xnoagent"/>
- <jvmarg value="-Djava.compiler=none"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
- <jvmarg value="-Dcatalina.base=${build.test}"/>
- <jvmarg value="-Dbuild=${build}"/>
- <jvmarg value="-Droller.custom.config=${build.tests}/planet-custom.properties"/>
- <classpath>
- <path refid="test.path"/>
- <pathelement location="${build.compile.test}"/>
- <pathelement location="${basedir}/build/test/testcontext" />
- <pathelement location="${basedir}/build/test/testcontext/WEB-INF/classes" />
- <pathelement path="${test.db.cpath}" />
- </classpath>
- </java>
- <antcall target="stop-db" />
- </target>
-
- <!-- Netbeans-only: debug single test class -->
- <target name="test-selected-files" if="netbeans.home" depends="build-tests"
- description="Test/debug a Single File">
- <fail unless="classname">Must set property 'classname'</fail>
- <antcall target="start-db" />
- <antcall target="init-db" />
- <nbjpdastart name="junit.textui.TestRunner" addressproperty="jpda.address" transport="dt_socket">
- <classpath>
- <path refid="test.path"/>
- <pathelement location="${build.compile.test}"/>
- <pathelement location="${basedir}/testdata" />
- <pathelement path="${test.db.cpath}" />
- </classpath>
- </nbjpdastart>
- <java classname="junit.textui.TestRunner" fork="true" dir="${build.test}">
- <arg value="${classname}" />
- <jvmarg value="-Xdebug"/>
- <jvmarg value="-Xnoagent"/>
- <jvmarg value="-Djava.compiler=none"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
- <jvmarg value="-Dcatalina.base=${build.test}"/>
- <jvmarg value="-Dbuild=${build}"/>
- <jvmarg value="-Droller.custom.config=${build.tests}/planet-custom.properties"/>
- <classpath>
- <path refid="test.path"/>
- <pathelement location="${build.compile.test}"/>
- <pathelement location="${basedir}/build/test/testcontext" />
- <pathelement location="${basedir}/build/test/testcontext/WEB-INF/classes" />
- <pathelement path="${test.db.cpath}" />
- </classpath>
- </java>
- <antcall target="stop-db" />
+ <!-- upgrade to 0.4.5 -->
+ <sql driver="${test.db.driver}"
+ url="${test.db.url}"
+ userid="${test.db.username}"
+ password="${test.db.password}"
+ src="${sql}/0.4.4-to-0.4.5.sql"
+ onerror="continue"
+ classpath="${test.db.cpath}" />
</target>
</project>
Added: roller/planet/core/trunk/lib/buildtime/activation.jar
URL: http://svn.apache.org/viewvc/roller/planet/core/trunk/lib/buildtime/activation.jar?rev=672574&view=auto
==============================================================================
Binary file - no diff available.
Propchange: roller/planet/core/trunk/lib/buildtime/activation.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: roller/planet/core/trunk/lib/buildtime/commons-httpclient-2.0.2.jar
URL: http://svn.apache.org/viewvc/roller/planet/core/trunk/lib/buildtime/commons-httpclient-2.0.2.jar?rev=672574&view=auto
==============================================================================
Binary file - no diff available.
Propchange: roller/planet/core/trunk/lib/buildtime/commons-httpclient-2.0.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: roller/planet/core/trunk/lib/buildtime/junit-4.1.jar
URL: http://svn.apache.org/viewvc/roller/planet/core/trunk/lib/buildtime/junit-4.1.jar?rev=672574&view=auto
==============================================================================
Binary file - no diff available.
Propchange: roller/planet/core/trunk/lib/buildtime/junit-4.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: roller/planet/core/trunk/lib/buildtime/mail.jar
URL: http://svn.apache.org/viewvc/roller/planet/core/trunk/lib/buildtime/mail.jar?rev=672574&view=auto
==============================================================================
Binary file - no diff available.
Propchange: roller/planet/core/trunk/lib/buildtime/mail.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: roller/planet/core/trunk/lib/buildtime/servlet-api.jar
URL: http://svn.apache.org/viewvc/roller/planet/core/trunk/lib/buildtime/servlet-api.jar?rev=672574&view=auto
==============================================================================
Binary file - no diff available.
Propchange: roller/planet/core/trunk/lib/buildtime/servlet-api.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: roller/planet/core/trunk/lib/commons-codec-1.3.jar
URL: http://svn.apache.org/viewvc/roller/planet/core/trunk/lib/commons-codec-1.3.jar?rev=672574&view=auto
==============================================================================
Binary file - no diff available.
Propchange: roller/planet/core/trunk/lib/commons-codec-1.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: roller/planet/core/trunk/lib/commons-collections-3.2.jar
URL: http://svn.apache.org/viewvc/roller/planet/core/trunk/lib/commons-collections-3.2.jar?rev=672574&view=auto
==============================================================================
Binary file - no diff available.
Propchange: roller/planet/core/trunk/lib/commons-collections-3.2.jar
------------------------------------------------------------------------------
svn:executable = *
Propchange: roller/planet/core/trunk/lib/commons-collections-3.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: roller/planet/core/trunk/lib/commons-digester-1.6.jar
URL: http://svn.apache.org/viewvc/roller/planet/core/trunk/lib/commons-digester-1.6.jar?rev=672574&view=auto
==============================================================================
Binary file - no diff available.
Propchange: roller/planet/core/trunk/lib/commons-digester-1.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: roller/planet/core/trunk/lib/commons-lang-2.1.jar
URL: http://svn.apache.org/viewvc/roller/planet/core/trunk/lib/commons-lang-2.1.jar?rev=672574&view=auto
==============================================================================
Binary file - no diff available.
Propchange: roller/planet/core/trunk/lib/commons-lang-2.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: roller/planet/core/trunk/lib/commons-logging-1.0.4.jar
URL: http://svn.apache.org/viewvc/roller/planet/core/trunk/lib/commons-logging-1.0.4.jar?rev=672574&view=auto
==============================================================================
Binary file - no diff available.
Propchange: roller/planet/core/trunk/lib/commons-logging-1.0.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: roller/planet/core/trunk/lib/guice-1.0.jar
URL: http://svn.apache.org/viewvc/roller/planet/core/trunk/lib/guice-1.0.jar?rev=672574&view=auto
==============================================================================
Binary file - no diff available.
Propchange: roller/planet/core/trunk/lib/guice-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/LICENSE
URL: http://svn.apache.org/viewvc/roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/LICENSE?rev=672574&view=auto
==============================================================================
--- roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/LICENSE (added)
+++ roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/LICENSE Sat Jun 28 12:18:17 2008
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
\ No newline at end of file
Added: roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/NOTICE
URL: http://svn.apache.org/viewvc/roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/NOTICE?rev=672574&view=auto
==============================================================================
--- roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/NOTICE (added)
+++ roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/NOTICE Sat Jun 28 12:18:17 2008
@@ -0,0 +1,2 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
Added: roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/README
URL: http://svn.apache.org/viewvc/roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/README?rev=672574&view=auto
==============================================================================
--- roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/README (added)
+++ roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/README Sat Jun 28 12:18:17 2008
@@ -0,0 +1,138 @@
+---------------------------------------------------------------------------
+Standard Tag Library 1.1 -- BINARY DISTRIBUTION
+---------------------------------------------------------------------------
+Thanks for downloading this release of the Standard tag library,
+an implementation of the JavaServer Pages(tm)(JSP)
+Standard Tag Library (JSTL).
+
+JSTL is an effort of the Java Community Process (JCP) and
+comes out of the JSR-052 expert group. For more information on JSTL,
+please go to http://java.sun.com/products/jstl.
+
+We hope you find the tags, documents, and examples in this binary
+distribution of interest.
+
+---------------------------------------------------------------------------
+LIBRARY DEPENDENCIES
+
+This version of the Standard Tag Library has the following runtime
+dependencies:
+
+ 1. Dependencies provided by the JSP 2.0 container:
+ - Servlet 2.4
+ - JSP 2.0
+
+ 2. Dependencies provided in newer J2SEs (1.4.2 and higher)
+ - JAXP 1.2
+ - Xalan 2.5
+ - JDBC Standard Extension 2.0
+
+Since all of the dependencies in (2) are included in Sun's
+distribution of J2SE 1.4.2 (and higher), this is therefore the J2SE
+version of choice to use the standard tag library.
+
+If the java platform under which you run your JSP container does not
+provide these dependencies, they must be made available either globally
+to all web-applications by your container, or individually within the
+WEB-INF/lib directory of your web-application.
+
+For convenience, these jar files have been included in directory
+lib/old-dependencies of this distribution (assuming the build process
+of this distribution included them). If you would like to download
+these jar files yourself, instructions on where you can get them are
+included below.
+
+---
+JAXP 1.2
+
+The JAXP 1.2 jar files can be obtained in the Java Web Services
+Developer Pack (JWSDP) available at
+http://java.sun.com/products/jwsdp.
+
+ - jaxp-api.jar
+ - dom.jar
+ - sax.jar
+ - xercesImpl.jar
+
+---
+Xalan 2.5
+
+The Xalan jar file can be obtained in the Java Web Services
+Developer Pack (JWSDP) available at
+http://java.sun.com/products/jwsdp, as well as from
+Apache at http://xml.apache.org/xalan-j.
+
+ - xalan.jar
+
+Please note that if you use Sun's distribution of J2SE 1.4.1, you must
+supersede the version of xalan.jar provided by the J2SE with version
+2.5 or higher of Xalan. This newer version of xalan.jar must then be
+made available through the endorsed dirs mechanism.
+
+---
+JDBC Standard Extension 2.0
+
+The JDBC 2.0 Optional Package can be obtained from:
+http://java.sun.com/products/jdbc/download.html
+
+ - jdbc2_0-stdext.jar
+
+---------------------------------------------------------------------------
+WAR Files
+
+The following two files are standalone web applications (WARs) that are
+designed to work out of the box in order to help you learn JSTL:
+
+ standard-doc.war Documentation
+ standard-examples.war Simple examples of JSTL tags
+
+Note that 'standard-examples.war' will work out-of-the-box as long
+as the java platform under which you run your JSP container provides
+all the dependencies mentioned above (see Library Dependencies).
+This is the case if using Sun's distribution of J2SE 1.4.2 (and higher).
+
+If not all dependencies are provided by your runtime, then they must
+be made available to the web application as explained in section
+"Library Dependencies".
+
+---------------------------------------------------------------------------
+USING THE STANDARD TAG LIBRARY
+
+To use this distribution with your own web applications, simply copy the JAR
+files in the 'lib' directory (jstl.jar and standard.jar) to your application's
+WEB-INF/lib directory (add the other dependencies as well if your runtime
+does not already provide them). Then, import JSTL into your pages with the
+following directives:
+
+ CORE LIBRARY
+ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+
+ XML LIBRARY
+ <%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %>
+
+ FMT LIBRARY
+ <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+
+ SQL LIBRARY
+ <%@ taglib prefix="sql" uri="http://java.sun.com/jsp/jstl/sql" %>
+
+ FUNCTIONS LIBRARY
+ <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+
+---------------------------------------------------------------------------
+COMPATIBILITY
+
+The 1.1 version of the Standard Taglib has been tested under Tomcat 5.0.3
+and should work in any compliant JSP 2.0 container.
+
+---------------------------------------------------------------------------
+COMMENTS AND QUESTIONS
+
+Please join the taglibs-user@jakarta.apache.org mailing list if you have
+general usage questions about JSTL.
+
+Comments about the JSTL specification itself should be sent to
+jsr-52-comments@jcp.org.
+
+Enjoy!
+
Added: roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/lib/jstl.jar
URL: http://svn.apache.org/viewvc/roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/lib/jstl.jar?rev=672574&view=auto
==============================================================================
Binary file - no diff available.
Propchange: roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/lib/jstl.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/lib/serializer.jar
URL: http://svn.apache.org/viewvc/roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/lib/serializer.jar?rev=672574&view=auto
==============================================================================
Binary file - no diff available.
Propchange: roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/lib/serializer.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/lib/standard.jar
URL: http://svn.apache.org/viewvc/roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/lib/standard.jar?rev=672574&view=auto
==============================================================================
Binary file - no diff available.
Propchange: roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/lib/standard.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/lib/xalan.jar
URL: http://svn.apache.org/viewvc/roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/lib/xalan.jar?rev=672574&view=auto
==============================================================================
Binary file - no diff available.
Propchange: roller/planet/core/trunk/lib/jakarta-taglibs-standard-1.1.2/lib/xalan.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream