Author: olamy
Date: Wed Oct 26 12:24:05 2011
New Revision: 1189166
URL: http://svn.apache.org/viewvc?rev=1189166&view=rev
Log:
[MRM-1544] move to a struts2 theme based on bootstrap css and jquery
start adding new module and directory. the new theme currently do nothin except
having xhtml as a parent theme :-)
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/
archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/pom.xml
(with props)
archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/src/
archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/src/main/
archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/src/main/resources/
archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/src/main/resources/template/
archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/src/main/resources/template/jqboot/
archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/src/main/resources/template/jqboot/controlheader.ftl
archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/src/main/resources/template/jqboot/theme.properties
(with props)
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
archiva/trunk/archiva-modules/archiva-web/pom.xml
archiva/trunk/pom.xml
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java?rev=1189166&r1=1189165&r2=1189166&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
Wed Oct 26 12:24:05 2011
@@ -19,12 +19,12 @@ package org.apache.archiva.configuration
* under the License.
*/
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.Predicate;
-import org.apache.commons.configuration.CombinedConfiguration;
import org.apache.archiva.common.FileTypeUtils;
import org.apache.archiva.configuration.functors.FiletypeSelectionPredicate;
import
org.apache.archiva.configuration.io.registry.ConfigurationRegistryReader;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.Predicate;
+import org.apache.commons.configuration.CombinedConfiguration;
import org.codehaus.plexus.registry.Registry;
import org.codehaus.plexus.registry.RegistryException;
import org.codehaus.plexus.registry.RegistryListener;
@@ -77,6 +77,7 @@ public class FileTypes
* Default exclusions from artifact consumers that are using the file
types. Note that this is simplistic in the
* case of the support files (based on extension) as it is elsewhere - it
may be better to match these to actual
* artifacts and exclude later during scanning.
+ *
* @deprecated
*/
public static final List<String> DEFAULT_EXCLUSIONS =
FileTypeUtils.DEFAULT_EXCLUSIONS;
@@ -183,8 +184,7 @@ public class FileTypes
Field fld = commonsRegistry.getClass().getDeclaredField(
"configuration" );
fld.setAccessible( true );
fld.set( commonsRegistry, new CombinedConfiguration() );
- commonsRegistry.addConfigurationFromResource(
- "org/apache/archiva/configuration/default-archiva.xml" );
+ commonsRegistry.addConfigurationFromResource(
"org/apache/archiva/configuration/default-archiva.xml" );
// Read configuration as it was intended.
ConfigurationRegistryReader configReader = new
ConfigurationRegistryReader();
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/pom.xml?rev=1189166&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/pom.xml
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/pom.xml
Wed Oct 26 12:24:05 2011
@@ -0,0 +1,33 @@
+<?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.
+ -->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-web</artifactId>
+ <version>1.4-M2-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-struts2-jqboot-theme</artifactId>
+ <version>1.4-M2-SNAPSHOT</version>
+ <name>Archiva Web :: Struts2 JqBoot Theme</name>
+
+</project>
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/src/main/resources/template/jqboot/controlheader.ftl
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/src/main/resources/template/jqboot/controlheader.ftl?rev=1189166&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/src/main/resources/template/jqboot/controlheader.ftl
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/src/main/resources/template/jqboot/controlheader.ftl
Wed Oct 26 12:24:05 2011
@@ -0,0 +1 @@
+<#include "/${parameters.templateDir}/xhtml/controlheader.ftl" />
\ No newline at end of file
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/src/main/resources/template/jqboot/theme.properties
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/src/main/resources/template/jqboot/theme.properties?rev=1189166&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/src/main/resources/template/jqboot/theme.properties
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/src/main/resources/template/jqboot/theme.properties
Wed Oct 26 12:24:05 2011
@@ -0,0 +1 @@
+parent = xhtml
\ No newline at end of file
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/src/main/resources/template/jqboot/theme.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/src/main/resources/template/jqboot/theme.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1189166&r1=1189165&r2=1189166&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Wed Oct 26
12:24:05 2011
@@ -145,6 +145,10 @@
<artifactId>archiva-rest-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-struts2-jqboot-theme</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties?rev=1189166&r1=1189165&r2=1189166&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
Wed Oct 26 12:24:05 2011
@@ -17,6 +17,8 @@
# under the License.
#
+struts.ui.theme=jqboot
+
# define our own action mapper here
struts.mapper.class = org.apache.archiva.web.mapper.RepositoryActionMapper
#struts.objectFactory =
org.codehaus.plexus.spring.Struts2PlexusInSpringObjectFactory
Modified: archiva/trunk/archiva-modules/archiva-web/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/pom.xml?rev=1189166&r1=1189165&r2=1189166&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/pom.xml Wed Oct 26 12:24:05 2011
@@ -28,6 +28,7 @@
<modules>
<module>archiva-applet</module>
<module>archiva-security</module>
+ <module>archiva-struts2-jqboot-theme</module>
<module>archiva-webapp</module>
<module>archiva-webdav</module>
<module>archiva-rss</module>
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1189166&r1=1189165&r2=1189166&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Wed Oct 26 12:24:05 2011
@@ -362,6 +362,11 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-struts2-jqboot-theme</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
<artifactId>archiva-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>
