Tuesday, December 13, 2011

svn commit: r1214039 - in /labs/magnet: ./ flux/ flux/src/ flux/src/main/ flux/src/main/java/ flux/src/main/resources/ flux/src/main/webapp/ flux/src/main/webapp/WEB-INF/ flux/src/test/ flux/src/test/java/ flux/src/test/resources/ magnet/

Author: hadrian
Date: Wed Dec 14 03:00:28 2011
New Revision: 1214039

URL: http://svn.apache.org/viewvc?rev=1214039&view=rev
Log:
Add skeleton for wicket based gui

Added:
labs/magnet/flux/
labs/magnet/flux/pom.xml (with props)
labs/magnet/flux/src/
labs/magnet/flux/src/main/
labs/magnet/flux/src/main/java/
labs/magnet/flux/src/main/resources/
labs/magnet/flux/src/main/webapp/
labs/magnet/flux/src/main/webapp/WEB-INF/
labs/magnet/flux/src/main/webapp/WEB-INF/web.xml (with props)
labs/magnet/flux/src/test/
labs/magnet/flux/src/test/java/
labs/magnet/flux/src/test/resources/
Modified:
labs/magnet/magnet/pom.xml
labs/magnet/pom.xml

Added: labs/magnet/flux/pom.xml
URL: http://svn.apache.org/viewvc/labs/magnet/flux/pom.xml?rev=1214039&view=auto
==============================================================================
--- labs/magnet/flux/pom.xml (added)
+++ labs/magnet/flux/pom.xml Wed Dec 14 03:00:28 2011
@@ -0,0 +1,177 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.labs.magnet</groupId>
+ <artifactId>magnet</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../magnet</relativePath>
+ </parent>
+
+ <groupId>org.apache.labs.magnet</groupId>
+ <artifactId>flux</artifactId>
+ <packaging>war</packaging>
+ <name>Magnet :: Application :: Flux</name>
+
+ <dependencies>
+ <!-- Apache Wicket -->
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ </dependency>
+
+ <!-- Required for security stuff -->
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-auth-roles</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <!-- for testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <filtering>false</filtering>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <testResource>
+ <filtering>false</filtering>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1.1</version>
+ <configuration>
+ <packagingExcludes>WEB-INF/lib/jetty*.jar, WEB-INF/lib/servlet*.jar</packagingExcludes>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <supportedProjectTypes>
+ <supportedProjectType>jar</supportedProjectType>
+ <supportedProjectType>bundle</supportedProjectType>
+ <supportedProjectType>war</supportedProjectType>
+ </supportedProjectTypes>
+ <instructions>
+ <Webapp-Context>scrapbook</Webapp-Context>
+ <Web-ContextPath>/</Web-ContextPath>
+ <Bundle-ClassPath>.,WEB-INF/classes</Bundle-ClassPath>
+ <Embed-Directory>WEB-INF/lib</Embed-Directory>
+ <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+ <Embed-Transitive>true</Embed-Transitive>
+ <Import-Package>
+ !junit.framework,
+ !com.ibm.uvm.tools,
+ !com.sun.jdmk.comm,
+ !javax.jmdns,
+ javax.servlet,
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>${jetty.version}</version>
+ <configuration>
+ <connectors>
+ <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+ <port>8080</port>
+ <maxIdleTime>3600000</maxIdleTime>
+ </connector>
+ <connector implementation="org.eclipse.jetty.server.ssl.SslSocketConnector">
+ <port>8443</port>
+ <maxIdleTime>3600000</maxIdleTime>
+ <keystore>${project.build.directory}/test-classes/keystore</keystore>
+ <password>wicket</password>
+ <keyPassword>wicket</keyPassword>
+ </connector>
+ </connectors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>

Propchange: labs/magnet/flux/pom.xml
------------------------------------------------------------------------------
svn:executable = *

Added: labs/magnet/flux/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/labs/magnet/flux/src/main/webapp/WEB-INF/web.xml?rev=1214039&view=auto
==============================================================================
--- labs/magnet/flux/src/main/webapp/WEB-INF/web.xml (added)
+++ labs/magnet/flux/src/main/webapp/WEB-INF/web.xml Wed Dec 14 03:00:28 2011
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+
+ <display-name>flux</display-name>
+
+ <context-param>
+ <param-name>configuration</param-name>
+ <param-value>deployment</param-value>
+ </context-param>
+
+ <filter>
+ <filter-name>wicket.flux</filter-name>
+ <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
+ <init-param>
+ <param-name>applicationClassName</param-name>
+ <param-value>org.apache.labs.magnet.flux.FluxApplication</param-value>
+ </init-param>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>wicket.flux</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+</web-app>

Propchange: labs/magnet/flux/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:executable = *

Modified: labs/magnet/magnet/pom.xml
URL: http://svn.apache.org/viewvc/labs/magnet/magnet/pom.xml?rev=1214039&r1=1214038&r2=1214039&view=diff
==============================================================================
--- labs/magnet/magnet/pom.xml (original)
+++ labs/magnet/magnet/pom.xml Wed Dec 14 03:00:28 2011
@@ -41,6 +41,7 @@
<camel.version>2.8.2</camel.version>
<activemq.version>5.5.0</activemq.version>
<karaf.version>2.2.4</karaf.version>
+ <wicket.version>1.5.2</wicket.version>

<spring.version>3.0.6.RELEASE</spring.version>
<spring.xbean.version>3.5</spring.xbean.version>
@@ -117,6 +118,18 @@
<version>${camel.version}</version>
</dependency>

+ <!-- Apache Wicket -->
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-auth-roles</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>

Modified: labs/magnet/pom.xml
URL: http://svn.apache.org/viewvc/labs/magnet/pom.xml?rev=1214039&r1=1214038&r2=1214039&view=diff
==============================================================================
--- labs/magnet/pom.xml (original)
+++ labs/magnet/pom.xml Wed Dec 14 03:00:28 2011
@@ -64,6 +64,7 @@
<module>magnet</module>
<module>core</module>
<module>birdie</module>
+ <module>flux</module>
<module>features</module>

<module>graffiti</module>

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org

Posted by Игорь at 7:00 PM

No comments:

Post a Comment

Subscribe to: Post Comments (Atom)