You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/09/12 15:52:50 UTC
svn commit: r574957 - in /roller/trunk: apps/planet/ apps/weblogger/
apps/weblogger/nbproject/
apps/weblogger/src/java/org/apache/roller/weblogger/config/
apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/
apps/weblogger/src/sql/ ...
Author: snoopdave
Date: Wed Sep 12 06:52:49 2007
New Revision: 574957
URL: http://svn.apache.org/viewvc?rev=574957&view=rev
Log:
Fixes for Roller's Planet aggregator:
- Use correct handle for default planet in PlanetEntriesPager and in DB migration script
- By default, include PlanetModel in site wide models
- Fixed broken propeties init in JPA version of PlanetImpl
- Added missing Planet Config I18N strings
Modified:
roller/trunk/apps/planet/build.xml
roller/trunk/apps/weblogger/build.xml
roller/trunk/apps/weblogger/nbproject/project.xml
roller/trunk/apps/weblogger/properties.xmlf
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java
roller/trunk/apps/weblogger/src/sql/310-to-400-migration.vm
roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/PlanetConfig.jsp
roller/trunk/tools/roller-core/roller-core.jar
roller/trunk/tools/roller-planet/roller-planet-business.jar
Modified: roller/trunk/apps/planet/build.xml
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/build.xml?rev=574957&r1=574956&r2=574957&view=diff
==============================================================================
--- roller/trunk/apps/planet/build.xml (original)
+++ roller/trunk/apps/planet/build.xml Wed Sep 12 06:52:49 2007
@@ -84,7 +84,12 @@
<include name="openjpa-0.9.7/geronimo-jpa_3.0_spec-1.0.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"/> -->
@@ -202,10 +207,10 @@
<taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask" classpathref="planet.business.path" />
<openjpac>
<config propertiesFile="src/java/META-INF/persistence.xml" />
+ <fileset dir="src/java/org/apache/roller/planet/pojos" includes="*.java" />
<classpath>
<path refid="planet.business.path"/>
<pathelement location="${build.compile.business}" />
- <pathelement location="${build.compile.business}/org/apache/roller/planet/pojos" />
</classpath>
</openjpac>
Modified: roller/trunk/apps/weblogger/build.xml
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/build.xml?rev=574957&r1=574956&r2=574957&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/build.xml (original)
+++ roller/trunk/apps/weblogger/build.xml Wed Sep 12 06:52:49 2007
@@ -172,9 +172,9 @@
<taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask" classpathref="openjpac.path" />
<openjpac enforcePropertyRestrictions="false" >
<config propertiesFile="${ro.src}/META-INF/persistence.xml" />
- <!--<fileset dir="${build.compile.business}">
+ <fileset dir="${build.compile.business}">
<include name="**/pojos/*.class" />
- </fileset>-->
+ </fileset>
<classpath refid="openjpac.path" />
</openjpac>
Modified: roller/trunk/apps/weblogger/nbproject/project.xml
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/nbproject/project.xml?rev=574957&r1=574956&r2=574957&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/nbproject/project.xml (original)
+++ roller/trunk/apps/weblogger/nbproject/project.xml Wed Sep 12 06:52:49 2007
@@ -10,11 +10,6 @@
</properties>
<folders>
<source-folder>
- <label>web</label>
- <type>doc_root</type>
- <location>web</location>
- </source-folder>
- <source-folder>
<label>src</label>
<type>java</type>
<location>src/java</location>
@@ -24,6 +19,16 @@
<type>java</type>
<location>test/java</location>
</source-folder>
+ <source-folder>
+ <label>web</label>
+ <type>doc_root</type>
+ <location>web</location>
+ </source-folder>
+ <source-folder>
+ <label>WEB-INF</label>
+ <type>web_inf</type>
+ <location>web/WEB-INF</location>
+ </source-folder>
</folders>
<ide-actions>
<action name="build">
@@ -76,6 +81,10 @@
<label>Web Pages</label>
<location>web</location>
</source-folder>
+ <source-folder style="tree">
+ <label>WEB-INF Content</label>
+ <location>web/WEB-INF</location>
+ </source-folder>
<source-folder style="packages">
<label>src</label>
<location>src/java</location>
@@ -103,7 +112,7 @@
<compilation-unit>
<package-root>src/java</package-root>
<package-root>test/java</package-root>
- <classpath mode="compile">../../tools/lib/commons-betwixt-1.0-beta-1.jar:../../tools/lib/commons-codec-1.3.jar:../../tools/lib/commons-collections-3.2.jar:../../tools/lib/commons-digester-1.6.jar:../../tools/lib/commons-httpclient-2.0.2.jar:../../tools/lib/commons-id-0.1-SNAPSHOT.jar:../../tools/lib/commons-lang-2.1.jar:../../tools/lib/commons-logging-1.0.4.jar:../../tools/lib/concurrent-1.3.2.jar:../../tools/lib/guice-1.0.jar:../../tools/lib/jaxen-full.jar:../../tools/lib/jdom.jar:../../tools/lib/log4j-1.2.11.jar:../../tools/lib/lucene-1.4.3.jar:../../tools/lib/rome-0.9.jar:../../tools/lib/rome-fetcher-0.9.jar:../../tools/lib/saxpath.jar:../../tools/lib/taglibs-string.jar:../../tools/lib/velocity-1.5.jar:../../tools/hibernate-3.1/hibernate3.jar:../../tools/struts-2.0.6/lib/antlr-2.7.2.jar:../../tools/struts-2.0.6/lib/commons-beanutils-1.6.jar:../../tools/struts-2.0.6/lib/commons-chain-1.1.jar:../../tools/struts-2.0.6/lib/commons-fileupload-1.2.jar:../../tool
s/struts-2.0.6/lib/commons-io-1.3.1.jar:../../tools/struts-2.0.6/lib/commons-validator-1.3.0.jar:../../tools/struts-2.0.6/lib/freemarker-2.3.8.jar:../../tools/struts-2.0.6/lib/ognl-2.6.11.jar:../../tools/struts-2.0.6/lib/oro-2.0.8.jar:../../tools/struts-2.0.6/lib/struts2-core-2.0.6.jar:../../tools/struts-2.0.6/lib/struts2-spring-plugin-2.0.6.jar:../../tools/struts-2.0.6/lib/struts2-tiles-plugin-2.0.6.jar:../../tools/struts-2.0.6/lib/tiles-api-2.0-20070207.130156-4.jar:../../tools/struts-2.0.6/lib/tiles-core-2.0-20070207.130156-4.jar:../../tools/struts-2.0.6/lib/xwork-2.0.1.jar:../../tools/openjpa-0.9.7/geronimo-j2ee-connector_1.5_spec-1.0.1.jar:../../tools/openjpa-0.9.7/geronimo-jpa_3.0_spec-1.0.jar:../../tools/openjpa-0.9.7/geronimo-jta_1.0.1B_spec-1.0.1.jar:../../tools/openjpa-0.9.7/openjpa-0.9.7-incubating.jar:../../tools/openjpa-0.9.7/serp-1.11.0.jar:../../tools/xmlrpc-3.0/lib/ws-commons-util-1.0.1.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-client-3.0.jar:../../tools/xmlrpc-3
.0/lib/xmlrpc-common-3.0.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-server-3.0.jar:../../tools/spring-1.2/acegi-security-1.0.3.jar:../../tools/spring-1.2/spring.jar:../../tools/roller-core/roller-core.jar:../../tools/roller-planet/roller-planet-business.jar:../../tools/struts-1.2.4/lib/antlr.jar:../../tools/struts-1.2.4/lib/commons-beanutils.jar:../../tools/struts-1.2.4/lib/commons-digester.jar:../../tools/struts-1.2.4/lib/commons-validator.jar:../../tools/struts-1.2.4/lib/jakarta-oro.jar:../../tools/struts-1.2.4/lib/struts-el.jar:../../tools/struts-1.2.4/lib/struts.jar:../../tools/buildtime/tomcat-5.0.28/jsp-api.jar:../../tools/buildtime/tomcat-5.0.28/servlet-api.jar:../../tools/buildtime/activation.jar:../../tools/buildtime/mail.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/jstl.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/serializer.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/standard.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/xalan.jar:../../tools/hi
bernate-3.1/lib/asm-attrs.jar:../../tools/hibernate-3.1/lib/asm.jar:../../tools/hibernate-3.1/lib/cglib-2.1.3.jar:../../tools/hibernate-3.1/lib/dom4j-1.6.1.jar:../../tools/hibernate-3.1/lib/ehcache-1.1.jar:../../tools/hibernate-3.1/lib/jdbc2_0-stdext.jar:../../tools/hibernate-3.1/lib/jta.jar:../../tools/buildtime/junit-4.1.jar:../../tools/buildtime/ant-1.7.0/ant.jar:../../tools/buildtime/derbyclient.jar:../../tools/buildtime/derby.jar:../../tools/buildtime/derbyclient.jar:../../tools/buildtime/derbynet.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:../../tools/buildtime/mockrunner-0.35/lib/nekohtml.jar</classpath>
+ <classpath mode="compile">../../tools/lib/commons-codec-1.3.jar:../../tools/lib/commons-collections-3.2.jar:../../tools/lib/commons-digester-1.6.jar:../../tools/lib/commons-httpclient-2.0.2.jar:../../tools/lib/commons-id-0.1-SNAPSHOT.jar:../../tools/lib/commons-lang-2.1.jar:../../tools/lib/commons-logging-1.0.4.jar:../../tools/lib/concurrent-1.3.2.jar:../../tools/lib/guice-1.0.jar:../../tools/lib/jaxen-full.jar:../../tools/lib/jdom.jar:../../tools/lib/log4j-1.2.11.jar:../../tools/lib/lucene-1.4.3.jar:../../tools/lib/rome-0.9.jar:../../tools/lib/rome-fetcher-0.9.jar:../../tools/lib/saxpath.jar:../../tools/lib/taglibs-string.jar:../../tools/lib/velocity-1.5.jar:../../tools/hibernate-3.1/hibernate3.jar:../../tools/openjpa-0.9.7/geronimo-j2ee-connector_1.5_spec-1.0.1.jar:../../tools/openjpa-0.9.7/geronimo-jpa_3.0_spec-1.0.jar:../../tools/openjpa-0.9.7/geronimo-jta_1.0.1B_spec-1.0.1.jar:../../tools/openjpa-0.9.7/openjpa-0.9.7-incubating.jar:../../tools/openjpa-0.9
.7/serp-1.11.0.jar:../../tools/xmlrpc-3.0/lib/ws-commons-util-1.0.1.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-client-3.0.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-common-3.0.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-server-3.0.jar:../../tools/spring-1.2/acegi-security-1.0.3.jar:../../tools/spring-1.2/spring.jar:../../tools/roller-core/roller-core.jar:../../tools/roller-planet/roller-planet-business.jar:../../tools/struts-1.2.4/lib/antlr.jar:../../tools/struts-1.2.4/lib/commons-beanutils.jar:../../tools/struts-1.2.4/lib/commons-digester.jar:../../tools/struts-1.2.4/lib/commons-validator.jar:../../tools/struts-1.2.4/lib/jakarta-oro.jar:../../tools/struts-1.2.4/lib/struts-el.jar:../../tools/struts-1.2.4/lib/struts.jar:../../tools/buildtime/tomcat-5.0.28/jsp-api.jar:../../tools/buildtime/tomcat-5.0.28/servlet-api.jar:../../tools/buildtime/activation.jar:../../tools/buildtime/mail.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/jstl.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/seria
lizer.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/standard.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/xalan.jar:../../tools/hibernate-3.1/lib/asm-attrs.jar:../../tools/hibernate-3.1/lib/asm.jar:../../tools/hibernate-3.1/lib/cglib-2.1.3.jar:../../tools/hibernate-3.1/lib/dom4j-1.6.1.jar:../../tools/hibernate-3.1/lib/ehcache-1.1.jar:../../tools/hibernate-3.1/lib/jdbc2_0-stdext.jar:../../tools/hibernate-3.1/lib/jta.jar:../../tools/buildtime/junit-4.1.jar:../../tools/buildtime/ant-1.7.0/ant.jar:../../tools/buildtime/derbyclient.jar:../../tools/buildtime/derby.jar:../../tools/buildtime/derbyclient.jar:../../tools/buildtime/derbynet.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:../../tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:../../tools/struts-2.0.9/lib/antlr-2.7.2.jar:../../tools/struts-2.0.9/lib/commons-beanutils-1.6
.jar:../../tools/struts-2.0.9/lib/commons-chain-1.1.jar:../../tools/struts-2.0.9/lib/commons-fileupload-1.2.jar:../../tools/struts-2.0.9/lib/commons-io-1.3.1.jar:../../tools/struts-2.0.9/lib/commons-validator-1.3.0.jar:../../tools/struts-2.0.9/lib/freemarker-2.3.8.jar:../../tools/struts-2.0.9/lib/ognl-2.6.11.jar:../../tools/struts-2.0.9/lib/oro-2.0.8.jar:../../tools/struts-2.0.9/lib/struts2-core-2.0.9.jar:../../tools/struts-2.0.9/lib/struts2-spring-plugin-2.0.9.jar:../../tools/struts-2.0.9/lib/struts2-tiles-plugin-2.0.9.jar:../../tools/struts-2.0.9/lib/tiles-api-2.0.4.jar:../../tools/struts-2.0.9/lib/tiles-core-2.0.4.jar:../../tools/struts-2.0.9/lib/tiles-jsp-2.0.4.jar:../../tools/struts-2.0.9/lib/xwork-2.0.4.jar</classpath>
<source-level>1.5</source-level>
</compilation-unit>
</java-data>
@@ -112,8 +121,6 @@
<doc-root>web</doc-root>
<context-path>/roller</context-path>
<j2ee-spec-level>1.5</j2ee-spec-level>
- <web-inf>web/WEB-INF</web-inf>
-
</web-module>
</web-data>
</configuration>
Modified: roller/trunk/apps/weblogger/properties.xmlf
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/properties.xmlf?rev=574957&r1=574956&r2=574957&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/properties.xmlf (original)
+++ roller/trunk/apps/weblogger/properties.xmlf Wed Sep 12 06:52:49 2007
@@ -33,28 +33,27 @@
<property name="ro.tests" value="${basedir}/test/java" />
<!-- build properties -->
-<property name="build.generated" value="${ro.build}/generated"/>
-<property name="build.generated.business" value="${build.generated}/business"/>
-<property name="build.generated.web" value="${build.generated}/web"/>
-<property name="build.compile" value="${ro.build}/compile"/>
-<property name="build.compile.business" value="${build.compile}/business"/>
-<property name="build.compile.web" value="${build.compile}/web"/>
-<property name="build.compile.contrib" value="${build.compile}/contrib"/>
-<property name="build.compile.tests" value="${build.compile}/tests"/>
-<property name="build.lib" value="${ro.build}/lib"/>
-<property name="build.webapp" value="${ro.build}/webapp"/>
-<property name="build.dist" value="${ro.build}/release"/>
-<property name="build.dist.apache" value="${build.dist}/apache"/>
-<property name="build.dist.binary" value="${build.dist}/apache-roller-${ro.version}"/>
-<property name="build.dist.sources" value="${build.dist}/apache-roller-src-${ro.version}"/>
-<property name="build.dbscripts" value="${build.webapp}/WEB-INF/classes/dbscripts"/>
-<property name="build.tests" value="${ro.build}/tests"/>
-<property name="build.reports" value="${build.tests}/reports"/>
-<property name="build.docs" value="${ro.build}/docs"/>
-<property name="build.javadoc" value="${build.docs}/javadoc"/>
-<property name="build.velocidoc" value="${build.docs}/velocidoc"/>
-<property name="build.jspc" value="${ro.build}/jspc"/>
-
+<property name="build.generated" value="${ro.build}/generated"/>
+<property name="build.generated.business" value="${build.generated}/business"/>
+<property name="build.generated.web" value="${build.generated}/web"/>
+<property name="build.compile" value="${ro.build}/compile"/>
+<property name="build.compile.business" value="${build.compile}/business"/>
+<property name="build.compile.web" value="${build.compile}/web"/>
+<property name="build.compile.contrib" value="${build.compile}/contrib"/>
+<property name="build.compile.tests" value="${build.compile}/tests"/>
+<property name="build.lib" value="${ro.build}/lib"/>
+<property name="build.webapp" value="${ro.build}/webapp"/>
+<property name="build.dist" value="${ro.build}/release"/>
+<property name="build.dist.apache" value="${build.dist}/apache"/>
+<property name="build.dist.binary" value="${build.dist}/apache-roller-${ro.version}"/>
+<property name="build.dist.sources" value="${build.dist}/apache-roller-src-${ro.version}"/>
+<property name="build.dbscripts" value="${build.webapp}/WEB-INF/classes/dbscripts"/>
+<property name="build.tests" value="${ro.build}/tests"/>
+<property name="build.reports" value="${build.tests}/reports"/>
+<property name="build.docs" value="${ro.build}/docs"/>
+<property name="build.javadoc" value="${build.docs}/javadoc"/>
+<property name="build.velocidoc" value="${build.docs}/velocidoc"/>
+<property name="build.jspc" value="${ro.build}/jspc"/>
<!-- various libraries used by Roller -->
<property name="tools.struts2" value="${ro.tools}/struts-2.0.9" />
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties?rev=574957&r1=574956&r2=574957&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties Wed Sep 12 06:52:49 2007
@@ -459,7 +459,9 @@
# Set of page models specifically for site-wide rendering
rendering.siteModels=\
-org.apache.roller.weblogger.ui.rendering.model.SiteModel
+org.apache.roller.weblogger.ui.rendering.model.SiteModel,\
+org.apache.roller.weblogger.ui.rendering.model.PlanetModel
+
# Velocity settings
velocity.properties=/WEB-INF/velocity.properties
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java?rev=574957&r1=574956&r2=574957&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/PlanetEntriesPager.java Wed Sep 12 06:52:49 2007
@@ -94,7 +94,7 @@
List results = new ArrayList();
try {
PlanetManager planetManager = PlanetFactory.getPlanet().getPlanetManager();
- Planet planet = planetManager.getPlanet("zzz_default_planet_zzz");
+ Planet planet = planetManager.getPlanet("default");
List rawEntries = null;
if (feedURL != null) {
Modified: roller/trunk/apps/weblogger/src/sql/310-to-400-migration.vm
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/sql/310-to-400-migration.vm?rev=574957&r1=574956&r2=574957&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/sql/310-to-400-migration.vm (original)
+++ roller/trunk/apps/weblogger/src/sql/310-to-400-migration.vm Wed Sep 12 06:52:49 2007
@@ -30,7 +30,7 @@
-- upgrade old planet users to work with the new Roller Planet code
-- all groups must have a planet now, so provide a default planet and
-- put all existing groups in the new default planet
-insert into rag_planet (id,title,handle) values ('zzz_default_planet_zzz','Default Planet','zzz_default_planet_zzz');
+insert into rag_planet (id,title,handle) values ('zzz_default_planet_zzz','Default Planet','default');
update rag_group set planet_id='zzz_default_planet_zzz';
Modified: roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties?rev=574957&r1=574956&r2=574957&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties Wed Sep 12 06:52:49 2007
@@ -1200,6 +1200,9 @@
ConfigForm.proxyHost=Proxy host for feed fetcher
ConfigForm.proxyPort=Proxy port for feed fetcher
+ConfigForm.message.saveSucceeded=Saved Planet configuration
+ConfigForm.error.saveFailed=Error saving Planet configuration
+
planetConfig.title.control=Experimental Planet Control
planetConfig.prompt.control=Launch background tasks (for testing purposes only)
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/PlanetConfig.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/PlanetConfig.jsp?rev=574957&r1=574956&r2=574957&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/PlanetConfig.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/PlanetConfig.jsp Wed Sep 12 06:52:49 2007
@@ -18,24 +18,6 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/xml" prefix="x" %>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. The ASF licenses this file to You
- under the Apache License, Version 2.0 (the "License"); you may not
- use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. For additional information regarding
- copyright in this work, please see the NOTICE file in the top level
- directory of this distribution.
---%>
-<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
<p class="subtitle"><s:text name="planetConfig.subtitle" /></a>
<p><s:text name="planetConfig.prompt" /></a>
Modified: roller/trunk/tools/roller-core/roller-core.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/roller-core/roller-core.jar?rev=574957&r1=574956&r2=574957&view=diff
==============================================================================
Binary files - no diff available.
Modified: roller/trunk/tools/roller-planet/roller-planet-business.jar
URL: http://svn.apache.org/viewvc/roller/trunk/tools/roller-planet/roller-planet-business.jar?rev=574957&r1=574956&r2=574957&view=diff
==============================================================================
Binary files - no diff available.