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 2016/05/27 22:50:24 UTC
[02/47] roller git commit: Better notes about the fork.
Better notes about the fork.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/76d87c28
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/76d87c28
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/76d87c28
Branch: refs/heads/bootstrap-ui
Commit: 76d87c2835275616bcad3fffc339b9042723923a
Parents: ddd4193
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Jan 2 13:05:40 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Jan 2 13:05:40 2015 -0500
----------------------------------------------------------------------
README.md | 33 +++++++++++++
README.txt | 63 ------------------------
app/roller-webapp.iml | 118 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 151 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/76d87c28/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..c113dae
--- /dev/null
+++ b/README.md
@@ -0,0 +1,33 @@
+README.txt
+===
+
+This is my personal and experimental fork of Apache Roller.
+There are two experiments here:
+
+1) shiro_not_spring: is a branch of Roller's trunk that has been modified to use
+Apache Shiro for security instead of Spring. Also, all Spring depdenencies have been removed.
+
+2) jaxrs_not_struts: is a branch of Roller's trunk that has been modified to add
+a REST API, powered by Apache CXF and Apache Shiro. Someday this REST API could power
+a new JavaScript based web interface for Roller.
+
+README.txt
+===
+
+This is Rollarcus: my experimental fork of [Apache Roller](https://github.com/apache/roller).
+So far, there are two experiments here:
+
+1) [https://github.com/snoopdave/rollarcus/tree/shiro_not_spring(shiro_not_spring): is a branch of Roller's trunk
+that has been modified to use Apache Shiro for security instead of Spring. Also, all Spring depdenencies have been
+removed.
+
+2) [https://github.com/snoopdave/rollarcus/tree/jaxrs_not_struts](jaxrs_not_struts): is a branch of Roller's
+trunk that has been modified to add a REST API, powered by Apache CXF and Apache Shiro. Someday this REST API
+could power a new JavaScript based web interface for Roller.
+
+
+That's all
+---
+
+Want to contribute? Shoot me a PR.
+
http://git-wip-us.apache.org/repos/asf/roller/blob/76d87c28/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
deleted file mode 100644
index ad9cc19..0000000
--- a/README.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-README.txt
-
-
-This is my personal and experimental fork of Apache Roller.
-There are two experiments here:
-
-1) shiro_not_spring: is a branch of Roller's trunk that has been modified to use
-Apache Shiro for security instead of Spring. Also, all Spring depdenencies have been removed.
-
-2) jaxrs_not_struts: is a branch of Roller's trunk that has been modified to add
-a REST API, powered by Apache CXF and Apache Shiro. Someday this REST API could power
-a new JavaScript based web interface for Roller.
-
-
-----------------------------------------------------------
-
-This file exists at the top-level of the Roller source tree.
-
-Roller is made up of the following Maven projects:
-
- roller-project: Top level project
- app: Roller Weblogger webapp, JSP pages, Velocity templates
- assembly-release: Used to create official distributions of Roller
- docs: Roller documentation in ODT (OpenOffice/LibreOffice) format
- it-selenium Integrated browser tests for Roller using Selenium
-
-To pull the latest trunk sources you need a Subversion client:
- svn co https://svn.apache.org/repos/asf/roller/trunk roller_trunk
-
-Building this version of Roller requires Apache Maven 3.0.5.
- - How to build Roller: https://cwiki.apache.org/confluence/x/EM4
- - To build and run Roller on Eclipse: https://cwiki.apache.org/confluence/x/EM4
-
-----------------------------------------------------------
-How to build the source
-
-The normal Roller build creates a product generically suitable for use several
-application containers, however see the Roller Install guide for application server
-specific configuration information.
-
-After pulling the source tree and changing directory to its top level, as
-indicated above, the following command will build and run all unit tests:
-
- mvn clean install
-
-After doing that, you should find the newly built Roller webapp, suitable
-for use in app/target/roller.
-
-To build Roller, subsequently run "mvn clean install" from the assembly-release
-folder. After that, you'll find Roller distribution files in
-assembly-release/target.
-
----------------------------
-NOTES
-
-Building other versions of Roller
-
-If you wish to pull a branch other than the trunk, replace the word
-"trunk" in both lines above with the appropriate branch name. Note that
-versions of Roller before 5.0 have an Ant-based build. In general, you should
-be able to follow instructions accompanying the sources that you pull in order
-to build that version.
-
http://git-wip-us.apache.org/repos/asf/roller/blob/76d87c28/app/roller-webapp.iml
----------------------------------------------------------------------
diff --git a/app/roller-webapp.iml b/app/roller-webapp.iml
new file mode 100644
index 0000000..3ff24c6
--- /dev/null
+++ b/app/roller-webapp.iml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="web" name="Web">
+ <configuration>
+ <descriptors>
+ <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
+ </descriptors>
+ <webroots>
+ <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
+ </webroots>
+ <sourceRoots>
+ <root url="file://$MODULE_DIR$/src/main/java" />
+ <root url="file://$MODULE_DIR$/src/main/resources" />
+ </sourceRoots>
+ </configuration>
+ </facet>
+ </component>
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/webapp" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Maven: org.eclipse.persistence:eclipselink:2.5.2" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.persistence:javax.persistence:2.1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.eclipse.persistence:commonj.sdo:2.1.1" level="project" />
+ <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+ <orderEntry type="library" name="Maven: com.google.inject:guice:3.0" level="project" />
+ <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
+ <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:4.10.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:4.10.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:4.10.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:4.10.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:4.10.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
+ <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlrpc:xmlrpc-common:3.1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlrpc:xmlrpc-client:3.1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlrpc:xmlrpc-server:3.1.3" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.ws.commons.util:ws-commons-util:1.0.2" level="project" />
+ <orderEntry type="library" name="Maven: net.oauth.core:oauth-provider:20100527" level="project" />
+ <orderEntry type="library" name="Maven: net.oauth.core:oauth:20100527" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.0.1" level="project" />
+ <orderEntry type="library" name="Maven: com.rometools:rome-fetcher:1.5.0" level="project" />
+ <orderEntry type="library" name="Maven: com.rometools:rome:1.5.0" level="project" />
+ <orderEntry type="library" name="Maven: com.rometools:rome-utils:1.5.0" level="project" />
+ <orderEntry type="library" name="Maven: org.jdom:jdom:2.0.2" level="project" />
+ <orderEntry type="library" name="Maven: com.rometools:rome-propono:1.5.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.1" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:slf4j-log4j12:1.7.7" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.7" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-web:4.1.0.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.0.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.0.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.0.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.0.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.0.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:3.2.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:3.2.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.security:spring-security-ldap:3.2.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.ldap:spring-ldap-core:1.3.2.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-tx:3.2.8.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.security:spring-security-openid:3.2.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.openid4java:openid4java-nodeps:0.9.6" level="project" />
+ <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:3.2.5.RELEASE" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.20" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: xerces:xercesImpl:2.10.0" level="project" />
+ <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents:httpclient:4.2.3" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents:httpcore:4.2.2" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.security:spring-security-taglibs:3.2.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.security:spring-security-acl:3.2.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.struts:struts2-spring-plugin:2.3.16.3" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.struts:struts2-core:2.3.16.3" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.struts.xwork:xwork-core:2.3.16.3" level="project" />
+ <orderEntry type="library" name="Maven: asm:asm:3.3" level="project" />
+ <orderEntry type="library" name="Maven: asm:asm-commons:3.3" level="project" />
+ <orderEntry type="library" name="Maven: asm:asm-tree:3.3" level="project" />
+ <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.19" level="project" />
+ <orderEntry type="library" name="Maven: ognl:ognl:3.0.6" level="project" />
+ <orderEntry type="library" name="Maven: javassist:javassist:3.11.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.struts:struts2-tiles-plugin:2.3.16.3" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tiles:tiles-core:2.0.6" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tiles:tiles-api:2.0.6" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging-api:1.1" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.tiles:tiles-jsp:2.0.6" level="project" />
+ <orderEntry type="library" name="Maven: xml-security:xmlsec:1.3.0" level="project" />
+ <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: javax.mail:mail:1.4.7" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet.jsp:jsp-api:2.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-validator:commons-validator:1.4.0" level="project" />
+ <orderEntry type="library" name="Maven: commons-digester:commons-digester:1.8" level="project" />
+ <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.derby:derbynet:10.11.1.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.derby:derby:10.11.1.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant:1.9.4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant-launcher:1.9.4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.derby:derbyclient:10.11.1.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+ </component>
+</module>
\ No newline at end of file