diff options
8 files changed, 52 insertions, 5 deletions
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java index 384567fe0..e48696ce3 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java @@ -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(); diff --git a/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/pom.xml b/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/pom.xml new file mode 100644 index 000000000..6892cb658 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/pom.xml @@ -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> diff --git a/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/src/main/resources/template/jqboot/controlheader.ftl b/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/src/main/resources/template/jqboot/controlheader.ftl new file mode 100644 index 000000000..bf166559a --- /dev/null +++ b/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/src/main/resources/template/jqboot/controlheader.ftl @@ -0,0 +1 @@ +<#include "/${parameters.templateDir}/xhtml/controlheader.ftl" />
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/src/main/resources/template/jqboot/theme.properties b/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/src/main/resources/template/jqboot/theme.properties new file mode 100644 index 000000000..49429d0cc --- /dev/null +++ b/archiva-modules/archiva-web/archiva-struts2-jqboot-theme/src/main/resources/template/jqboot/theme.properties @@ -0,0 +1 @@ +parent = xhtml
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 93a3ae7e8..99ec0b427 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -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> diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties index ef7d0c9a0..323ffd79c 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties @@ -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 diff --git a/archiva-modules/archiva-web/pom.xml b/archiva-modules/archiva-web/pom.xml index 3c035333f..19b6572b4 100644 --- a/archiva-modules/archiva-web/pom.xml +++ b/archiva-modules/archiva-web/pom.xml @@ -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> @@ -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> |