roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r894711 [3/4] - in /roller/branches/roller_mavenized: ./ apps/planet/ apps/weblogger/ components/ planet-business/ planet-business/src/ planet-business/src/main/ planet-business/src/main/java/ planet-business/src/main/java/META-INF/ planet-...
Date Wed, 30 Dec 2009 21:14:11 GMT
Added: roller/branches/roller_mavenized/weblogger-assembly/src/main/assembly/binary.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/weblogger-assembly/src/main/assembly/binary.xml?rev=894711&view=auto
==============================================================================
--- roller/branches/roller_mavenized/weblogger-assembly/src/main/assembly/binary.xml (added)
+++ roller/branches/roller_mavenized/weblogger-assembly/src/main/assembly/binary.xml Wed Dec 30 21:13:25 2009
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  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.
+-->
+<assembly>
+  <id>binary</id>
+  <formats>
+    <format>zip</format>
+    <format>tar.gz</format>
+    <format>tar.bz2</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+
+  <fileSets>
+     <fileSet>
+        <outputDirectory>
+            ${artifact.artifactId}-${artifact.version}/webapp/roller
+        </outputDirectory>
+        <directory>../weblogger-web/target/roller</directory>   
+     </fileSet>
+  </fileSets>
+
+  <files> 
+     <file> 
+        <source>../README.txt</source>
+        <outputDirectory>${artifact.artifactId}-${artifact.version}</outputDirectory>
+     </file> 
+     <file> 
+        <source>../NOTICE.txt</source>
+        <outputDirectory>${artifact.artifactId}-${artifact.version}</outputDirectory>
+     </file> 
+     <file> 
+        <source>../LICENSE.txt</source>
+        <outputDirectory>${artifact.artifactId}-${artifact.version}</outputDirectory>
+     </file> 
+     <file> 
+        <source>../weblogger-docs/installguide/generated/roller-install-guide.pdf</source>
+        <outputDirectory>${artifact.artifactId}-${artifact.version}/docs</outputDirectory>
+     </file> 
+     <file> 
+        <source>../weblogger-docs/userguide/generated/roller-user-guide.pdf</source>
+        <outputDirectory>${artifact.artifactId}-${artifact.version}/docs</outputDirectory>
+     </file> 
+     <file> 
+        <source>../weblogger-docs/templateguide/generated/roller-template-guide.pdf</source>
+        <outputDirectory>${artifact.artifactId}-${artifact.version}/docs</outputDirectory>
+     </file> 
+  </files>
+
+</assembly>

Added: roller/branches/roller_mavenized/weblogger-assembly/src/main/assembly/source.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/weblogger-assembly/src/main/assembly/source.xml?rev=894711&view=auto
==============================================================================
--- roller/branches/roller_mavenized/weblogger-assembly/src/main/assembly/source.xml (added)
+++ roller/branches/roller_mavenized/weblogger-assembly/src/main/assembly/source.xml Wed Dec 30 21:13:25 2009
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  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.
+-->
+<assembly>
+  <id>source</id>
+  <formats>
+    <format>zip</format>
+    <format>tar.gz</format>
+    <format>tar.bz2</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <outputDirectory>roller-webglogger-${pom.version}-source</outputDirectory>
+      <directory>${project.basedir}/../</directory>
+      <includes>
+        <include>**</include>
+      </includes>
+      <excludes>
+        <!-- scm -->
+        <exclude>**/.git/**</exclude>
+        <exclude>**/.svn/**</exclude>
+        <!-- IDE -->
+        <exclude>**/*.iws</exclude>
+        <exclude>**/*.ipr</exclude>
+        <exclude>**/*.iml</exclude>
+        <exclude>**/.project</exclude>
+        <exclude>**/.classpath</exclude>
+        <exclude>**/.settings/**</exclude>
+        <exclude>**/.deployables/**</exclude>
+        <exclude>**/.wtpmodules/**</exclude>
+        <exclude>**/.externalToolBuilders/**</exclude>
+        <exclude>**/maven-eclipse.xml</exclude>
+        <!-- maven -->
+        <exclude>**/target/**</exclude>
+        <exclude>**/pom.xml.releaseBackup</exclude>
+        <exclude>**/release.properties</exclude>
+
+        <!-- misc -->
+        <exclude>**/*.patch</exclude>
+        <exclude>**/*.diff</exclude>
+        <exclude>**/*.log</exclude>
+        <exclude>**/*.bak</exclude>
+        <exclude>**/*~</exclude>
+        <exclude>**/#*#</exclude>
+        <exclude>**/%*%</exclude>
+        <exclude>**/samples/create.sql</exclude>
+        <exclude>**/samples/drop.sql</exclude>
+        <exclude>**/derby.log</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>
+</assembly>

Propchange: roller/branches/roller_mavenized/weblogger-business/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 30 21:13:25 2009
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings

Added: roller/branches/roller_mavenized/weblogger-business/pom.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/weblogger-business/pom.xml?rev=894711&view=auto
==============================================================================
--- roller/branches/roller_mavenized/weblogger-business/pom.xml (added)
+++ roller/branches/roller_mavenized/weblogger-business/pom.xml Wed Dec 30 21:13:25 2009
@@ -0,0 +1,424 @@
+<project> 
+    <modelVersion>4.0.0</modelVersion> 
+    
+    <parent>
+        <groupId>org.apache.roller</groupId>
+        <artifactId>roller-project</artifactId>
+        <version>5.0-BETA2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    
+    <name>Apache Roller Weblogger Business Module</name>
+    <description>
+       Business logic and persistence for Roller Weblogger.
+    </description>
+    <groupId>org.apache.roller</groupId> 
+    <artifactId>roller-weblogger-business</artifactId> 
+    <version>5.0-BETA2-SNAPSHOT</version>
+
+    <properties>
+       <testOutputDirectory>${project.build.testOutputDirectory}</testOutputDirectory>
+    </properties>
+  
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.roller</groupId>
+            <artifactId>roller-core</artifactId>
+            <version>5.0-BETA2-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.roller</groupId>
+            <artifactId>roller-planet-business</artifactId>
+            <version>5.0-BETA2-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.code.guice</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-core</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>rome</groupId>
+            <artifactId>rome</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>rome</groupId>
+            <artifactId>rome-fetcher</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>rome</groupId>
+            <artifactId>rome-propono</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.texen</groupId>
+            <artifactId>texen</artifactId>
+        </dependency>
+
+       <dependency>
+            <groupId>org.apache.xmlrpc</groupId>
+            <artifactId>xmlrpc-common</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.xmlrpc</groupId>
+            <artifactId>xmlrpc-client</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.xmlrpc</groupId>
+            <artifactId>xmlrpc-server</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.ws.commons.util</groupId>
+            <artifactId>ws-commons-util</artifactId>
+        </dependency>
+            
+        <dependency>
+            <groupId>net.oauth.core</groupId>
+            <artifactId>oauth</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.oauth.core</groupId>
+            <artifactId>oauth-provider</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- test deps -->
+
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbynet</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbyclient</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+     </dependencies>
+
+    <build>
+        <plugins>
+    
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <includeEmptyDirs>true</includeEmptyDirs>
+                </configuration>
+            </plugin>
+    
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>catalina.base</name>
+                            <value>${project.build.testOutputDirectory}</value>
+                        </property>
+                        <property>
+                            <name>context.realpath</name>
+                            <value>${project.basedir}/src/main/webapp</value>
+                        </property>
+						<property>
+							<name>project.build.directory</name>
+							<value>${project.build.directory}</value>
+						</property>
+                    </systemProperties>
+                    <excludes>
+                        <exclude>**/TestUtils.java</exclude>
+                        <exclude>**/TestTask.java</exclude>
+                    </excludes>
+                    <!--
+                    <includes>
+                        <include>**/PlanetManagerLocalTest.java</include>
+                    </includes> 
+                    -->
+               </configuration>
+            </plugin>
+    
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.velocity</groupId>
+                        <artifactId>velocity</artifactId>
+                        <version>1.6</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.roller</groupId>
+                        <artifactId>test-utils</artifactId>
+                        <version>5.0-BETA2-SNAPSHOT</version>
+                        <scope>test</scope>
+                    </dependency>
+                </dependencies>
+    
+                <executions>
+                    
+                    <execution>
+                        <id>gen-db-scripts</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <taskdef name="texen"
+                                         classname="org.apache.velocity.texen.ant.TexenTask"
+                                         classpathref="maven.compile.classpath"/>    
+                                <texen
+                                        controlTemplate  ="control.vm"
+                                        contextProperties="${project.build.outputDirectory}/sql/dbscripts.properties"
+                                        templatePath     ="${project.build.outputDirectory}/sql"
+                                        outputDirectory  ="${project.build.outputDirectory}/sql"
+                                        outputFile="README.txt"/>    
+                            </tasks>
+                        </configuration>
+                    </execution>
+    
+                    <execution>
+                        <id>startdb</id>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <taskdef name="startdb" classname="org.apache.roller.weblogger.ant.StartDerbyTask"
+                                         classpathref="maven.compile.classpath"/>
+                                <startdb database="${project.build.testOutputDirectory}/derby-system/planet_business"
+                                         port="3219"></startdb>
+                            </tasks>
+                        </configuration>
+                    </execution>
+    
+                    <execution>
+                        <id>stopdb</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <taskdef name="stopdb" classname="org.apache.roller.weblogger.ant.StopDerbyTask"
+                                         classpathref="maven.compile.classpath"/>
+                                <stopdb port="3219"></stopdb>
+                                <delete dir="${project.build.testOutputDirectory}/derby-system"/>
+                                <delete dir="${project.build.testOutputDirectory}/mediafiles"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                    
+                </executions>
+            </plugin>
+        
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>sql-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.derby</groupId>
+                        <artifactId>derby</artifactId>
+                        <version>10.4.2.0</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.derby</groupId>
+                        <artifactId>derbyclient</artifactId>
+                        <version>10.4.2.0</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                
+                    <execution>
+                        <id>initdb</id>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <driver>${jdbcDriverClass}</driver>
+                            <url>jdbc:derby://localhost:3219/roller;create=true</url>
+                            <username>app</username>
+                            <password>app</password>
+                            <autocommit>true</autocommit>
+                            <onError>continue</onError>
+                            <srcFiles>
+                               <srcFile>${project.build.outputDirectory}/sql/droptables.sql</srcFile>
+                               <srcFile>${project.build.outputDirectory}/sql/derby/createdb.sql</srcFile>
+                            </srcFiles>
+                        </configuration>
+                    </execution>
+                    
+                </executions>
+            </plugin>
+
+              <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>buildnumber-maven-plugin</artifactId>
+                <version>1.0-beta-3</version>
+                <executions>
+                  <execution>
+                    <phase>validate</phase>
+                    <goals>
+                      <goal>create</goal>
+                    </goals>
+                  </execution>
+                </executions>
+                <configuration>
+                  <doUpdate>false</doUpdate>
+                </configuration>
+              </plugin>
+
+        </plugins>
+
+        <testResources>
+            <testResource>
+                <directory>${project.basedir}/src/test/resources</directory>
+                <filtering>true</filtering>
+            </testResource>
+            <testResource>
+                <directory>${project.basedir}/../weblogger-web/src/main/webapp/</directory>
+                <filtering>false</filtering>
+                <includes>
+                    <include>themes/**</include>
+                </includes>
+            </testResource>
+        </testResources>
+
+        <resources>
+            <resource>
+                <directory>${project.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/**</include>
+                </includes>
+            </resource>                        
+        </resources>
+        
+    </build>
+    
+    <profiles>
+        <profile>
+            <id>openjpa</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.openjpa</groupId>
+                    <artifactId>openjpa</artifactId>
+                </dependency>
+            </dependencies>
+            <properties>
+                <jpaProviderClass>org.apache.openjpa.persistence.PersistenceProviderImpl</jpaProviderClass>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>openjpa-enhance</id>
+                                <phase>process-classes</phase>
+                                <configuration>
+                                    <tasks>
+                                        <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask"
+                                                 classpathref="maven.compile.classpath"/>
+                                        <openjpac enforcePropertyRestrictions="false">
+                                            <classpath refid="maven.compile.classpath"/>
+                                        </openjpac>
+                                    </tasks>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>derby-db</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.derby</groupId>
+                    <artifactId>derby</artifactId>
+                </dependency>
+            </dependencies>
+            <properties>
+                <jdbcDriverClass>org.apache.derby.jdbc.ClientDriver</jdbcDriverClass>
+            </properties>
+        </profile>
+    </profiles>
+    
+</project>

Added: roller/branches/roller_mavenized/weblogger-business/src/main/java/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/weblogger-business/src/main/java/META-INF/MANIFEST.MF?rev=894711&view=auto
==============================================================================
--- roller/branches/roller_mavenized/weblogger-business/src/main/java/META-INF/MANIFEST.MF (added)
+++ roller/branches/roller_mavenized/weblogger-business/src/main/java/META-INF/MANIFEST.MF Wed Dec 30 21:13:25 2009
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/WebloggerException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/WebloggerException.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/TestUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/test/java/org/apache/roller/weblogger/TestUtils.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/business/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business:713070-782269

Added: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/business/TestTask.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/business/TestTask.java?rev=894711&view=auto
==============================================================================
--- roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/business/TestTask.java (added)
+++ roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/business/TestTask.java Wed Dec 30 21:13:25 2009
@@ -0,0 +1,38 @@
+package org.apache.roller.weblogger.business;
+
+import java.util.Date;
+import org.apache.roller.weblogger.business.runnable.RollerTaskWithLeasing;
+
+public class TestTask extends RollerTaskWithLeasing {
+    
+    public TestTask() {
+        
+    }
+
+    public String getName() {
+        return "TestTask";
+    }
+
+    public String getClientId() {
+        return "TestTaskClientId";
+    }
+
+    public Date getStartTime(Date current) {
+        return current;
+    }
+
+    public String getStartTimeDesc() {
+        return "immediate";
+    }
+
+    public int getLeaseTime() {
+        return 300;
+    }
+
+    public int getInterval() {
+        return 1800;
+    }
+
+    public void runTask() {
+    }
+}

Modified: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPersistenceStrategy.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPersistenceStrategy.java?rev=894711&r1=836018&r2=894711&view=diff
==============================================================================
--- roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPersistenceStrategy.java (original)
+++ roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPersistenceStrategy.java Wed Dec 30 21:13:25 2009
@@ -121,7 +121,8 @@
 
             try {
                 this.emf = Persistence.createEntityManagerFactory("RollerPU", emfProps);
-            } catch (PersistenceException pe) {
+                
+            } catch (Throwable pe) {
                 logger.error("ERROR: creating entity manager", pe);
                 throw new WebloggerException(pe);
             }

Modified: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java?rev=894711&r1=836018&r2=894711&view=diff
==============================================================================
--- roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java (original)
+++ roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java Wed Dec 30 21:13:25 2009
@@ -1168,12 +1168,14 @@
         List results = new ArrayList();
         for (Iterator iter = queryResults.iterator(); iter.hasNext();) {
             Object[] row = (Object[]) iter.next();
-            results.add(new StatCount(
-                    (String)row[1],                             // entry id
+            StatCount sc = new StatCount(
+                    (String)row[1],                             // weblog handle
                     (String)row[2],                             // entry anchor
                     (String)row[3],                             // entry title
                     "statCount.weblogEntryCommentCountType",    // stat desc
-                    ((Long)row[0]).longValue())); // count
+                    ((Long)row[0]).longValue());                // count
+            sc.setWeblogHandle((String)row[1]);
+            results.add(sc);
         }
         // Original query ordered by desc count.
         // JPA QL doesn't allow queries to be ordered by agregates; do it in memory

Modified: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java?rev=894711&r1=836018&r2=894711&view=diff
==============================================================================
--- roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java (original)
+++ roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java Wed Dec 30 21:13:25 2009
@@ -666,12 +666,14 @@
         List results = new ArrayList();
         for (Iterator iter = queryResults.iterator(); iter.hasNext();) {
             Object[] row = (Object[]) iter.next();
-            results.add(new StatCount(
+            StatCount sc = new StatCount(
                     (String)row[1],                     // website id
                     (String)row[2],                     // website handle
                     (String)row[3],                     // website name
                     "statCount.weblogCommentCountType", // stat type
-                    ((Long)row[0]).longValue())); // # comments
+                    ((Long)row[0]).longValue());        // # comments
+            sc.setWeblogHandle((String)row[2]);
+            results.add(sc);
         }
         // Original query ordered by desc # comments.
         // JPA QL doesn't allow queries to be ordered by agregates; do it in memory

Modified: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java?rev=894711&r1=836018&r2=894711&view=diff
==============================================================================
--- roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java (original)
+++ roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java Wed Dec 30 21:13:25 2009
@@ -85,7 +85,7 @@
             
             // make sure it exists and is readable
             File themeDirFile = new File(themeDir);
-            if(!themeDirFile.exists() || 
+            if (!themeDirFile.exists() || 
                     !themeDirFile.isDirectory() || 
                     !themeDirFile.canRead()) {
                 throw new RuntimeException("couldn't access theme dir ["+themeDir+"]");
@@ -334,7 +334,7 @@
             public boolean accept(File dir, String name) {
                 File file =
                         new File(dir.getAbsolutePath() + File.separator + name);
-                return file.isDirectory();
+                return file.isDirectory() && !file.getName().startsWith(".");
             }
         };
         String[] themenames = themesdir.list(filter);

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/config/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/config:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java:713070-782269

Copied: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java (from r836018, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java)
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java?p2=roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java&r1=836018&r2=894711&rev=894711&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java (original)
+++ roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java Wed Dec 30 21:13:25 2009
@@ -115,23 +115,30 @@
         // lookup recent entries from weblog and add them to the subscription
         try {
             int entryCount = WebloggerRuntimeConfig.getIntProperty("site.newsfeeds.defaultEntries");
+
+            if (log.isDebugEnabled()) {
+                log.debug("Seeking up to " + entryCount + " entries from " + localWeblog.getHandle());
+            }
             
             // grab recent entries for this weblog
             WeblogEntryManager wmgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
             List<WeblogEntry> entries = wmgr.getWeblogEntries(
-                    localWeblog,
-                    null,
+                    localWeblog,                 // weblog
+                    null,                        // user
                     null,                        // startDate
                     null,                        // endDate
                     null,                        // catName
-                    null,WeblogEntry.PUBLISHED,   // status
+                    null,                        // tags
+                    WeblogEntry.PUBLISHED,       // status
                     null,                        // text
                     null,                        // sortby (null means pubTime)
-                    null,
+                    null,                        // sortOrder
                     null,                        // locale
                     0,                           // offset
-                    entryCount);
+                    entryCount);                 // range
             
+            log.debug("Found " + entries.size());
+
             // Populate subscription object with new entries
             PluginManager ppmgr = WebloggerFactory.getWeblogger().getPluginManager();
             Map pagePlugins = ppmgr.getWeblogEntryPlugins(localWeblog);

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/business/jpa/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java:713070-782269

Copied: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java (from r836018, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java)
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java?p2=roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java&p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java&r1=836018&r2=894711&rev=894711&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java (original)
+++ roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java Wed Dec 30 21:13:25 2009
@@ -143,12 +143,13 @@
             // first, make sure there is an "all" pmgr group
             Planet planetObject = pmgr.getPlanetById("zzz_default_planet_zzz");
             PlanetGroup group = pmgr.getGroup(planetObject, "all");
-            if(group == null) {
+            if (group == null) {
                 group = new PlanetGroup();
                 group.setPlanet(planetObject);
                 group.setHandle("all");
                 group.setTitle("all");
                 pmgr.saveGroup(group);
+                PlanetFactory.getPlanet().flush();
             }
             
             // walk through all enable weblogs and add/update subs as needed
@@ -171,14 +172,17 @@
                     sub = new Subscription();
                     sub.setTitle(weblog.getName());
                     sub.setFeedURL(feedUrl);
-                    sub.setSiteURL(WebloggerFactory.getWeblogger()
-                            .getUrlStrategy().getWeblogURL(weblog, null, true));
+                    sub.setSiteURL(
+                        WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogURL(weblog, null, true));
                     sub.setAuthor(weblog.getName());
                     sub.setLastUpdated(new Date(0));
-                    
                     pmgr.saveSubscription(sub);
+                    
+                    sub.getGroups().add(group);
                     group.getSubscriptions().add(sub);
+
                     pmgr.saveGroup(group);
+
                 } else {
                     log.debug("UPDATING feed: "+feedUrl);
                     

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 30 21:13:25 2009
@@ -0,0 +1,4 @@
+.LCKWeblogEntryData.java~
+.LCKRefererData.java~
+.LCKPlanetEntryData.java~
+.LCKUserData.java~

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/AutoPing.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/BookmarkComparator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/BookmarkComparator.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/FileContent.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/FileContent.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/GlobalPermission.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFile.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileComparator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFileComparator.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectoryComparator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFileDirectoryComparator.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFileFilter.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileTag.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFileTag.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFileType.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/ObjectPermission.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/ObjectPermission.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/PingQueueEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/PingQueueEntry.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/PingTarget.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/PingTarget.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Resource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Resource.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/RollerPermission.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/RollerPermission.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StatCount.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/StatCount.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StatCountCountComparator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/StatCountCountComparator.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/StaticTemplate.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TagStat.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TagStat.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TagStat.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/TagStat.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TagStat.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TagStatComparator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TagStatComparator.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TagStatComparator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/TagStatComparator.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TagStatComparator.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TagStatCountComparator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/TagStatCountComparator.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TaskLock.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/TaskLock.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Template.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Template.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Theme.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Theme.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/ThemeResource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/ThemeResource.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/User.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/User.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/UserAttribute.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/UserAttribute.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/UserRole.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/UserRole.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogCategory.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategoryPathComparator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogCategoryPathComparator.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryWrapperComparator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryWrapperComparator.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogHitCount.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogHitCount.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogPermission.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogReferrer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogReferrer.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTheme.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogTheme.java:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/util/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/util:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/jpa/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/package.html:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/package.html:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/pings/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/pings/package.html:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/plugins/comment/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/comment/package.html:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/plugins/entry/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/package.html:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/plugins/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/package.html:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/referrers/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/package.html:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/runnable/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/package.html:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/search/operations/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/package.html:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/search/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/package.html:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/startup/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/package.html:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/themes/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/package.html:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/config/package.html:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/runtime/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/config/runtime/package.html:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/config/runtimeConfigDefs.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/planet/business/jpa/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/package.html:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/planet/business/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/package.html:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/planet/tasks/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/planet/tasks/package.html:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFile.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/PingTarget.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/TaskLock.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/User.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/UserRole.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/datamodel40.png
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/datamodel40.png:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/datamodel40.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/package.html:713070-782269

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/wrapper/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper:713070-782269

Added: roller/branches/roller_mavenized/weblogger-business/src/main/resources/roller-version.properties
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/weblogger-business/src/main/resources/roller-version.properties?rev=894711&view=auto
==============================================================================
--- roller/branches/roller_mavenized/weblogger-business/src/main/resources/roller-version.properties (added)
+++ roller/branches/roller_mavenized/weblogger-business/src/main/resources/roller-version.properties Wed Dec 30 21:13:25 2009
@@ -0,0 +1,5 @@
+ro.version=${project.version}
+ro.revision=r${buildNumber}
+ro.buildTime=${timestamp}
+ro.buildUser=${user.name}
+

Propchange: roller/branches/roller_mavenized/weblogger-business/src/main/resources/sql/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 21:13:25 2009
@@ -0,0 +1 @@
+/roller/branches/roller_mediablogging/apps/weblogger/src/sql:713070-782269

Added: roller/branches/roller_mavenized/weblogger-business/src/main/resources/sql/db2.properties
URL: http://svn.apache.org/viewvc/roller/branches/roller_mavenized/weblogger-business/src/main/resources/sql/db2.properties?rev=894711&view=auto
==============================================================================
--- roller/branches/roller_mavenized/weblogger-business/src/main/resources/sql/db2.properties (added)
+++ roller/branches/roller_mavenized/weblogger-business/src/main/resources/sql/db2.properties Wed Dec 30 21:13:25 2009
@@ -0,0 +1,28 @@
+# 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.
+
+DBTYPE=DB2
+TEXT_SQL_TYPE=clob(102400)
+BOOLEAN_SQL_TYPE_FALSE =smallint default 0
+BOOLEAN_SQL_TYPE_TRUE =smallint default 1
+BOOLEAN_SQL_TYPE =smallint
+BOOLEAN_FALSE =0
+BOOLEAN_TRUE =1
+INDEXSIZE=
+INDEXSIZE_LARGE=
+ADDL_FK_PARAMS=on delete no action on update no action enforced enable query optimization
+TIMESTAMP_SQL_TYPE_NULL=timestamp
+TIMESTAMP_SQL_TYPE=timestamp



Mime
View raw message