Author: carlucci
Date: Tue Jun 19 19:21:25 2012
New Revision: 1351806
URL: http://svn.apache.org/viewvc?rev=1351806&view=rev
Log:
RAVE-684: Re-structure static content directories
Added:
rave/trunk/rave-portal-resources/src/main/webapp/static/
rave/trunk/rave-portal-resources/src/main/webapp/static/css/
- copied from r1350297,
rave/trunk/rave-portal-resources/src/main/webapp/css/
rave/trunk/rave-portal-resources/src/main/webapp/static/images/
- copied from r1350297,
rave/trunk/rave-portal-resources/src/main/webapp/images/
rave/trunk/rave-portal-resources/src/main/webapp/static/script/
- copied from r1350297,
rave/trunk/rave-portal-resources/src/main/webapp/script/
Removed:
rave/trunk/rave-portal-resources/src/main/webapp/css/
rave/trunk/rave-portal-resources/src/main/webapp/images/
rave/trunk/rave-portal-resources/src/main/webapp/script/
Modified:
rave/trunk/rave-portal-resources/pom.xml
rave/trunk/rave-portal-resources/src/main/resources/wro.xml
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext-security.xml
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/common/footer.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_css.tag
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
Modified: rave/trunk/rave-portal-resources/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/pom.xml?rev=1351806&r1=1351805&r2=1351806&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/pom.xml (original)
+++ rave/trunk/rave-portal-resources/pom.xml Tue Jun 19 19:21:25 2012
@@ -113,7 +113,7 @@
<goal>test</goal>
</goals>
<configuration>
-
<jsSrcDir>${project.basedir}/src/main/webapp/script/</jsSrcDir>
+
<jsSrcDir>${project.basedir}/src/main/webapp/static/script/</jsSrcDir>
<debug>true</debug>
<sourceExcludes>
<exclude>rave_layout.js</exclude>
@@ -150,9 +150,9 @@
<!-- minimize instructs the processors to handle their
minimization work -->
<minimize>true</minimize>
<!-- location of the javascript after processing -->
-
<jsDestinationFolder>${project.build.directory}/${project.build.finalName}/script/</jsDestinationFolder>
+
<jsDestinationFolder>${project.build.directory}/${project.build.finalName}/static/script/</jsDestinationFolder>
<!-- location of the CSS after
processing -->
-
<cssDestinationFolder>${project.build.directory}/${project.build.finalName}/css/</cssDestinationFolder>
+
<cssDestinationFolder>${project.build.directory}/${project.build.finalName}/static/css/</cssDestinationFolder>
<!-- location of webapp directory that wro4j uses for its
location context -->
<contextFolder>${basedir}/src/main/webapp/</contextFolder>
<wroManagerFactory>ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory</wroManagerFactory>
Modified: rave/trunk/rave-portal-resources/src/main/resources/wro.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/resources/wro.xml?rev=1351806&r1=1351805&r2=1351806&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/resources/wro.xml (original)
+++ rave/trunk/rave-portal-resources/src/main/resources/wro.xml Tue Jun 19
19:21:25 2012
@@ -20,10 +20,10 @@ under the License.
<groups xmlns="http://www.isdc.ro/wro";>
<!-- defines a wro4j group called rave-all.min which represents all of our
javascript files -->
<group name="rave_all.min">
- <js>/script/*.js</js>
+ <js>/static/script/*.js</js>
</group>
<!-- defines a wro4j group called rave_css which represents the rave less
file -->
<group name="rave">
- <css>/css/rave.less</css>
+ <css>/static/css/rave.less</css>
</group>
</groups>
\ No newline at end of file
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext-security.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext-security.xml?rev=1351806&r1=1351805&r2=1351806&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext-security.xml
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext-security.xml
Tue Jun 19 19:21:25 2012
@@ -28,12 +28,8 @@
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security-3.1.xsd";>
-
-
-
<security:http auto-config="true" use-expressions="true"
disable-url-rewriting="true">
-
-
+ <security:intercept-url pattern="/static/**" access="permitAll"/>
<security:intercept-url pattern="/login" access="permitAll"/>
<security:intercept-url pattern="/newaccount.jsp*" access="permitAll"/>
<security:intercept-url pattern="/app/newaccount*" access="permitAll"/>
@@ -41,9 +37,6 @@
<security:intercept-url pattern="/app/retrieveusername/**"
access="permitAll"/>
<security:intercept-url pattern="/app/changepassword/**"
access="permitAll"/>
<security:intercept-url pattern="/app/messagebundle/*.js"
access="permitAll"/>
- <security:intercept-url pattern="/css/**" access="permitAll"/>
- <security:intercept-url pattern="/images/**" access="permitAll"/>
- <security:intercept-url pattern="/script/**" access="permitAll"/>
<security:intercept-url pattern="/app/admin/**"
access="hasRole('ROLE_ADMIN')"/>
<!-- all urls must be authenticated -->
<security:intercept-url pattern="/**"
access="hasAnyRole('ROLE_USER','ROLE_ADMIN')"/>
@@ -90,9 +83,9 @@
<security:global-method-security secured-annotations="enabled"
pre-post-annotations="enabled">
<security:expression-handler ref="expressionHandler"/>
</security:global-method-security>
-
+
<!-- override the default permissionEvaluator bean used by Spring Security
with our custom RavePermissionEvaluator -->
<bean id="expressionHandler"
class="org.apache.rave.portal.security.impl.RaveMethodSecurityExpressionHandler">
- <property name="permissionEvaluator" ref="ravePermissionEvaluator" />
+ <property name="permissionEvaluator" ref="ravePermissionEvaluator" />
</bean>
</beans>
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/common/footer.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/common/footer.jsp?rev=1351806&r1=1351805&r2=1351806&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/common/footer.jsp
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/common/footer.jsp
Tue Jun 19 19:21:25 2012
@@ -23,7 +23,7 @@ under the License.
<div class="row">
<div class="span12 version">
<span>Apache Rave
${applicationProperties['portal.version']}</span>
- <a href="http://rave.apache.org";><img class="footer-logo"
alt="Apache Rave" title="Apache Rave" src="<c:url value="/images/rave-logo.png"
/>" /></a>
+ <a href="http://rave.apache.org";><img class="footer-logo"
alt="Apache Rave" title="Apache Rave" src="<c:url
value="/static/images/rave-logo.png" />" /></a>
</div>
</div>
</div>
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_css.tag
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_css.tag?rev=1351806&r1=1351805&r2=1351806&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_css.tag
(original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_css.tag
Tue Jun 19 19:21:25 2012
@@ -19,4 +19,4 @@
--%>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<rave:third_party_css />
-<link rel="stylesheet" href="<c:url value="/css/rave.css" />"/>
\ No newline at end of file
+<link rel="stylesheet" href="<c:url value="/static/css/rave.css" />"/>
\ No newline at end of file
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag?rev=1351806&r1=1351805&r2=1351806&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
(original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
Tue Jun 19 19:21:25 2012
@@ -26,18 +26,18 @@
<%-- check to see if the javaScriptDebugMode is on, if so render the
individual JS files, otherwise render the minified single file --%>
<c:choose>
<c:when test="${not empty portalSettings and not empty
portalSettings['javaScriptDebugMode'] and
portalSettings['javaScriptDebugMode'].value == '0'}">
- <script src="<spring:url value="/script/rave_all.min.js"/>"></script>
+ <script src="<spring:url
value="/static/script/rave_all.min.js"/>"></script>
</c:when>
<c:otherwise>
- <script src="<spring:url value="/script/rave.js"/>"></script>
- <script src="<spring:url value="/script/rave_api.js"/>"></script>
- <script src="<spring:url
value="/script/rave_opensocial.js"/>"></script>
- <script src="<spring:url value="/script/rave_wookie.js"/>"></script>
- <script src="<spring:url value="/script/rave_layout.js"/>"></script>
- <script src="<spring:url value="/script/rave_forms.js"/>"></script>
- <script src="<spring:url
value="/script/rave_person_profile.js"/>"></script>
- <script src="<spring:url value="/script/rave_store.js"/>"></script>
- <script src="<spring:url value="/script/rave_admin.js"/>"></script>
+ <script src="<spring:url value="/static/script/rave.js"/>"></script>
+ <script src="<spring:url
value="/static/script/rave_api.js"/>"></script>
+ <script src="<spring:url
value="/static/script/rave_opensocial.js"/>"></script>
+ <script src="<spring:url
value="/static/script/rave_wookie.js"/>"></script>
+ <script src="<spring:url
value="/static/script/rave_layout.js"/>"></script>
+ <script src="<spring:url
value="/static/script/rave_forms.js"/>"></script>
+ <script src="<spring:url
value="/static/script/rave_person_profile.js"/>"></script>
+ <script src="<spring:url
value="/static/script/rave_store.js"/>"></script>
+ <script src="<spring:url
value="/static/script/rave_admin.js"/>"></script>
</c:otherwise>
</c:choose>
<script src="<spring:url
value="/app/messagebundle/rave_client_messages.js"/>"></script>
