You are viewing a plain text version of this content. The canonical link for it is here.
Posted to droids-commits@incubator.apache.org by ry...@apache.org on 2008/11/09 17:27:19 UTC
svn commit: r712521 - in /incubator/droids/trunk: ./ depot/wicket/
droids-solr/ droids-wicket/ droids-wicket/conf/ droids-wicket/src/conf/
droids-wicket/src/java/ droids-wicket/src/main/
droids-wicket/src/main/java/ droids-wicket/src/main/java/org/apac...
Author: ryan
Date: Sun Nov 9 09:27:16 2008
New Revision: 712521
URL: http://svn.apache.org/viewvc?rev=712521&view=rev
Log:
moving depot/wicket to droids-wicket.
using maven build file
Added:
incubator/droids/trunk/droids-wicket/ (props changed)
- copied from r712512, incubator/droids/trunk/depot/wicket/
incubator/droids/trunk/droids-wicket/pom.xml
incubator/droids/trunk/droids-wicket/src/main/
incubator/droids/trunk/droids-wicket/src/main/java/ (props changed)
- copied from r712512, incubator/droids/trunk/depot/wicket/src/java/
incubator/droids/trunk/droids-wicket/src/main/resources/
incubator/droids/trunk/droids-wicket/src/main/resources/application.properties (props changed)
- copied unchanged from r712512, incubator/droids/trunk/depot/wicket/src/conf/application.properties
incubator/droids/trunk/droids-wicket/src/main/resources/applicationContext.xml (props changed)
- copied unchanged from r712512, incubator/droids/trunk/depot/wicket/src/conf/applicationContext.xml
incubator/droids/trunk/droids-wicket/src/main/resources/log4j.properties (props changed)
- copied unchanged from r712512, incubator/droids/trunk/depot/wicket/src/conf/log4j.properties
incubator/droids/trunk/droids-wicket/src/main/webapp/ (props changed)
- copied from r712512, incubator/droids/trunk/depot/wicket/src/webapp/
incubator/droids/trunk/droids-wicket/src/test/java/
incubator/droids/trunk/droids-wicket/src/test/java/org/ (props changed)
- copied from r712512, incubator/droids/trunk/depot/wicket/src/test/org/
Removed:
incubator/droids/trunk/depot/wicket/
incubator/droids/trunk/droids-wicket/DROIDS-README.txt
incubator/droids/trunk/droids-wicket/conf/
incubator/droids/trunk/droids-wicket/default.properties
incubator/droids/trunk/droids-wicket/ivy.xml
incubator/droids/trunk/droids-wicket/src/conf/
incubator/droids/trunk/droids-wicket/src/java/
incubator/droids/trunk/droids-wicket/src/test/org/
incubator/droids/trunk/droids-wicket/src/webapp/
Modified:
incubator/droids/trunk/droids-solr/pom.xml
incubator/droids/trunk/droids-wicket/src/main/java/org/apache/droids/wicket/app/IndexPage.java
incubator/droids/trunk/pom.xml
Modified: incubator/droids/trunk/droids-solr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-solr/pom.xml?rev=712521&r1=712520&r2=712521&view=diff
==============================================================================
--- incubator/droids/trunk/droids-solr/pom.xml (original)
+++ incubator/droids/trunk/droids-solr/pom.xml Sun Nov 9 09:27:16 2008
@@ -1,31 +1,24 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- ====================================================================
- 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
+<?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">
- 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.
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Apache Software Foundation. For more
- information on the Apache Software Foundation, please see
- <http://www.apache.org />.
- -->
-
-<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>
<artifactId>droids</artifactId>
Propchange: incubator/droids/trunk/droids-wicket/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Nov 9 09:27:16 2008
@@ -0,0 +1,4 @@
+.project
+.classpath
+log.txt
+bin
Propchange: incubator/droids/trunk/droids-wicket/
------------------------------------------------------------------------------
svn:mergeinfo =
Added: incubator/droids/trunk/droids-wicket/pom.xml
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-wicket/pom.xml?rev=712521&view=auto
==============================================================================
--- incubator/droids/trunk/droids-wicket/pom.xml (added)
+++ incubator/droids/trunk/droids-wicket/pom.xml Sun Nov 9 09:27:16 2008
@@ -0,0 +1,180 @@
+<?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>
+ <artifactId>droids</artifactId>
+ <groupId>org.apache.droids</groupId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>droids-wicket</artifactId>
+ <name>Droids Wicket Components</name>
+ <inceptionYear>2007</inceptionYear>
+ <description>
+ Droids Wicket Components
+ </description>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <!-- DROIDS DEPENDENCIES -->
+ <dependency>
+ <groupId>org.apache.droids</groupId>
+ <artifactId>droids-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <!-- WICKET DEPENDENCIES -->
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-spring</artifactId>
+ <version>${wicket.version}</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+
+ <!-- OPTIONAL
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-extensions</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ -->
+
+ <!-- LOGGING DEPENDENCIES - LOG4J -->
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+
+ <!-- JUNIT DEPENDENCY FOR TESTING -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- JETTY DEPENDENCIES FOR TESTING -->
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>${jetty.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-management</artifactId>
+ <version>${jetty.version}</version>
+ <scope>provided</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/java</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>${maven.compile.source}</source>
+ <target>${maven.compile.target}</target>
+ <optimize>${maven.compile.optimize}</optimize>
+ <showDeprecations>${maven.compile.deprecation}</showDeprecations>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <wicket.version>1.4-m3</wicket.version>
+ <jetty.version>6.1.4</jetty.version>
+ </properties>
+
+</project>
Propchange: incubator/droids/trunk/droids-wicket/src/main/java/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: incubator/droids/trunk/droids-wicket/src/main/java/org/apache/droids/wicket/app/IndexPage.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-wicket/src/main/java/org/apache/droids/wicket/app/IndexPage.java?rev=712521&r1=712512&r2=712521&view=diff
==============================================================================
--- incubator/droids/trunk/droids-wicket/src/main/java/org/apache/droids/wicket/app/IndexPage.java (original)
+++ incubator/droids/trunk/droids-wicket/src/main/java/org/apache/droids/wicket/app/IndexPage.java Sun Nov 9 09:27:16 2008
@@ -21,6 +21,7 @@
import java.util.Collection;
import java.util.StringTokenizer;
+import org.apache.droids.exception.DroidsException;
import org.apache.droids.robot.walker.WalkingDroid;
import org.apache.droids.wicket.component.DroidPanel;
import org.apache.wicket.PageParameters;
@@ -65,8 +66,13 @@
info( "ADD: "+f.getAbsolutePath() );
}
droid.setInitialFiles( files );
- droid.init();
- droid.start();
+ try {
+ droid.init();
+ droid.start();
+ }
+ catch( DroidsException ex ) {
+ throw new RuntimeException("Hey!", ex);
+ }
}
initial.setObject( null );
}
Propchange: incubator/droids/trunk/droids-wicket/src/main/resources/application.properties
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/droids/trunk/droids-wicket/src/main/resources/applicationContext.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/droids/trunk/droids-wicket/src/main/resources/log4j.properties
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/droids/trunk/droids-wicket/src/main/webapp/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/droids/trunk/droids-wicket/src/test/java/org/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: incubator/droids/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/pom.xml?rev=712521&r1=712520&r2=712521&view=diff
==============================================================================
--- incubator/droids/trunk/pom.xml (original)
+++ incubator/droids/trunk/pom.xml Sun Nov 9 09:27:16 2008
@@ -1,31 +1,24 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- ====================================================================
- 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.
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Apache Software Foundation. For more
- information on the Apache Software Foundation, please see
- <http://www.apache.org />.
- -->
+<?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">
-<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>
<groupId>org.apache.droids</groupId>
<artifactId>droids</artifactId>
@@ -135,7 +128,7 @@
<module>droids-core</module>
<module>depot/dynamic</module>
<module>droids-solr</module>
-
+ <module>droids-wicket</module>
</modules>
</project>