svnno****@sourc*****
svnno****@sourc*****
2009年 10月 6日 (火) 01:21:49 JST
Revision: 3708
http://sourceforge.jp/projects/jiemamy/svn/view?view=rev&revision=3708
Author: shin1
Date: 2009-10-06 01:21:48 +0900 (Tue, 06 Oct 2009)
Log Message:
-----------
appengine1.2.5、wicket-1.4.1へのアップグレードと、makeSyncCallServletの配置を行った。
Modified Paths:
--------------
sandbox/jiemamy-feeds/.classpath
sandbox/jiemamy-feeds/.settings/com.google.appengine.eclipse.core.prefs
sandbox/jiemamy-feeds/pom.xml
sandbox/jiemamy-feeds/src/main/java/com/shin1ogawa/WicketApplication.java
sandbox/jiemamy-feeds/src/test/java/com/shin1ogawa/page/SettingTest.java
sandbox/jiemamy-feeds/war/WEB-INF/web.xml
Added Paths:
-----------
sandbox/jiemamy-feeds/war/WEB-INF/lib/appengine-api-1.0-sdk-1.2.5.jar
sandbox/jiemamy-feeds/war/WEB-INF/lib/appengine-api-labs-1.2.5.jar
sandbox/jiemamy-feeds/war/WEB-INF/lib/commons-beanutils-1.8.0.jar
sandbox/jiemamy-feeds/war/WEB-INF/lib/gaejtools-util-1.2.5-SNAPSHOT.jar
sandbox/jiemamy-feeds/war/WEB-INF/lib/twitter4j-2.0.10.jar
sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-1.4.1.jar
sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-auth-roles-1.4.1.jar
sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-extensions-1.4.1.jar
sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-guice-1.4.1.jar
sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-ioc-1.4.1.jar
Removed Paths:
-------------
sandbox/jiemamy-feeds/src/main/java/com/shin1ogawa/JdoModule.java
sandbox/jiemamy-feeds/war/WEB-INF/lib/appengine-api-1.0-sdk-1.2.2.jar
sandbox/jiemamy-feeds/war/WEB-INF/lib/datanucleus-appengine-1.0.2.jar
sandbox/jiemamy-feeds/war/WEB-INF/lib/datanucleus-core-1.1.4.jar
sandbox/jiemamy-feeds/war/WEB-INF/lib/datanucleus-jpa-1.1.4.jar
sandbox/jiemamy-feeds/war/WEB-INF/lib/geronimo-jpa_3.0_spec-1.1.1.jar
sandbox/jiemamy-feeds/war/WEB-INF/lib/geronimo-jta_1.1_spec-1.1.1.jar
sandbox/jiemamy-feeds/war/WEB-INF/lib/jdo2-api-2.3-ea.jar
sandbox/jiemamy-feeds/war/WEB-INF/lib/twitter4j-2.0.9.jar
sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-1.4.0.jar
sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-auth-roles-1.4.0.jar
sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-extensions-1.4.0.jar
sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-guice-1.4.0.jar
sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-ioc-1.4.0.jar
Property Changed:
----------------
sandbox/jiemamy-feeds/war/WEB-INF/
Modified: sandbox/jiemamy-feeds/.classpath
===================================================================
--- sandbox/jiemamy-feeds/.classpath 2009-10-05 16:20:56 UTC (rev 3707)
+++ sandbox/jiemamy-feeds/.classpath 2009-10-05 16:21:48 UTC (rev 3708)
@@ -9,6 +9,7 @@
<classpathentry kind="var" path="M2_REPO/com/google/appengine/appengine-api-1.0-stubs/1.2.5/appengine-api-1.0-stubs-1.2.5.jar"/>
<classpathentry kind="var" path="M2_REPO/com/google/appengine/appengine-api-labs/1.2.5/appengine-api-labs-1.2.5.jar"/>
<classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
@@ -16,6 +17,7 @@
<classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5.jar" sourcepath="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jp/sourceforge/gaejtools/gaejtools-util/1.2.5-SNAPSHOT/gaejtools-util-1.2.5-SNAPSHOT.jar" sourcepath="M2_REPO/jp/sourceforge/gaejtools/gaejtools-util/1.2.5-SNAPSHOT/gaejtools-util-1.2.5-SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/google/code/guice/guice/1.0/guice-1.0.jar" sourcepath="M2_REPO/com/google/code/guice/guice/1.0/guice-1.0-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1-sources.jar"/>
Modified: sandbox/jiemamy-feeds/.settings/com.google.appengine.eclipse.core.prefs
===================================================================
--- sandbox/jiemamy-feeds/.settings/com.google.appengine.eclipse.core.prefs 2009-10-05 16:20:56 UTC (rev 3707)
+++ sandbox/jiemamy-feeds/.settings/com.google.appengine.eclipse.core.prefs 2009-10-05 16:21:48 UTC (rev 3708)
@@ -1,5 +1,4 @@
-#Sat Oct 03 16:11:07 JST 2009
+#Mon Oct 05 23:35:02 JST 2009
eclipse.preferences.version=1
filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.2.5.jar|appengine-api-labs-1.2.5.jar|datanucleus-appengine-1.0.3.jar|datanucleus-core-1.1.5.jar|datanucleus-jpa-1.1.5.jar|geronimo-jpa_3.0_spec-1.1.1.jar|geronimo-jta_1.1_spec-1.1.1.jar|jdo2-api-2.3-eb.jar
ormEnhancementInclusions=
-validationExclusions=
Modified: sandbox/jiemamy-feeds/pom.xml
===================================================================
--- sandbox/jiemamy-feeds/pom.xml 2009-10-05 16:20:56 UTC (rev 3707)
+++ sandbox/jiemamy-feeds/pom.xml 2009-10-05 16:21:48 UTC (rev 3708)
@@ -22,6 +22,12 @@
<version>1.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>jp.sourceforge.gaejtools</groupId>
+ <artifactId>gaejtools-util</artifactId>
+ <version>1.2.5-SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
<!-- GAE for java(compile) -->
<dependency>
<groupId>com.google.appengine</groupId>
@@ -207,6 +213,7 @@
<![CDATA[
eclipse.preferences.version=1
filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.2.5.jar|appengine-api-labs-1.2.5.jar|datanucleus-appengine-1.0.3.jar|datanucleus-core-1.1.5.jar|datanucleus-jpa-1.1.5.jar|geronimo-jpa_3.0_spec-1.1.1.jar|geronimo-jta_1.1_spec-1.1.1.jar|jdo2-api-2.3-eb.jar
+ormEnhancementInclusions=
]]>
</content>
</file>
@@ -232,8 +239,8 @@
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<outputDirectory>war/WEB-INF/lib</outputDirectory>
- <excludeScope>provided</excludeScope>
<includeScope>compile</includeScope>
+ <excludeArtifactIds>appengine-api-1.0-runtime,appengine-api-1.0-runtime-shared,appengine-api-1.0-stubs,appengine-tools-sdk</excludeArtifactIds>
<excludeGroupIds>javax.servlet,javax.transaction,org.openqa.selenium.webdriver,net.sourceforge.htmlunit,net.sourceforge.nekohtml</excludeGroupIds>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
@@ -280,6 +287,13 @@
</build>
<repositories>
<repository>
+ <id>gaejtools</id>
+ <url>http://gaejtools.sourceforge.jp/maven/repository</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <repository>
<id>openqa-releases</id>
<name>OpenQA Releases</name>
<url>http://nexus.openqa.org/content/repositories/releases</url>
Deleted: sandbox/jiemamy-feeds/src/main/java/com/shin1ogawa/JdoModule.java
===================================================================
--- sandbox/jiemamy-feeds/src/main/java/com/shin1ogawa/JdoModule.java 2009-10-05 16:20:56 UTC (rev 3707)
+++ sandbox/jiemamy-feeds/src/main/java/com/shin1ogawa/JdoModule.java 2009-10-05 16:21:48 UTC (rev 3708)
@@ -1,31 +0,0 @@
-package com.shin1ogawa;
-
-import javax.jdo.JDOHelper;
-import javax.jdo.PersistenceManager;
-import javax.jdo.PersistenceManagerFactory;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Provider;
-
-/**
- * @author shin1ogawa
- */
-public class JdoModule extends AbstractModule {
-
- static PersistenceManagerFactory factory;
-
- static {
- factory = JDOHelper.getPersistenceManagerFactory("transactions-optional");
- }
-
- @Override
- protected void configure() {
- bind(PersistenceManagerFactory.class).toInstance(factory);
- bind(PersistenceManager.class).toProvider(new Provider<PersistenceManager>() {
-
- public PersistenceManager get() {
- return factory.getPersistenceManager();
- }
- });
- }
-}
Modified: sandbox/jiemamy-feeds/src/main/java/com/shin1ogawa/WicketApplication.java
===================================================================
--- sandbox/jiemamy-feeds/src/main/java/com/shin1ogawa/WicketApplication.java 2009-10-05 16:20:56 UTC (rev 3707)
+++ sandbox/jiemamy-feeds/src/main/java/com/shin1ogawa/WicketApplication.java 2009-10-05 16:21:48 UTC (rev 3708)
@@ -67,7 +67,7 @@
@Override
protected void configure() {
- install(new JdoModule());
+ //
}
};
}
Modified: sandbox/jiemamy-feeds/src/test/java/com/shin1ogawa/page/SettingTest.java
===================================================================
--- sandbox/jiemamy-feeds/src/test/java/com/shin1ogawa/page/SettingTest.java 2009-10-05 16:20:56 UTC (rev 3707)
+++ sandbox/jiemamy-feeds/src/test/java/com/shin1ogawa/page/SettingTest.java 2009-10-05 16:21:48 UTC (rev 3708)
@@ -30,7 +30,8 @@
public static void setUpBeforeClass() {
PageTestUtil.setUpBeforePageTest();
tester = new WicketTester(new WicketApplication());
- ApplicationSettingUtil.setSettingValue("DummyKey", "DummyValue");
+ ApplicationSettingUtil.setSettingValue("DummyKey1", "DummyValue1");
+ ApplicationSettingUtil.setSettingValue("DummyKey2", "DummyValue2");
}
@AfterClass
Property changes on: sandbox/jiemamy-feeds/war/WEB-INF
___________________________________________________________________
Modified: svn:ignore
- appengine-generated
+ appengine-generated
classes
Deleted: sandbox/jiemamy-feeds/war/WEB-INF/lib/appengine-api-1.0-sdk-1.2.2.jar
===================================================================
(Binary files differ)
Added: sandbox/jiemamy-feeds/war/WEB-INF/lib/appengine-api-1.0-sdk-1.2.5.jar
===================================================================
(Binary files differ)
Property changes on: sandbox/jiemamy-feeds/war/WEB-INF/lib/appengine-api-1.0-sdk-1.2.5.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: sandbox/jiemamy-feeds/war/WEB-INF/lib/appengine-api-labs-1.2.5.jar
===================================================================
(Binary files differ)
Property changes on: sandbox/jiemamy-feeds/war/WEB-INF/lib/appengine-api-labs-1.2.5.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: sandbox/jiemamy-feeds/war/WEB-INF/lib/commons-beanutils-1.8.0.jar
===================================================================
(Binary files differ)
Property changes on: sandbox/jiemamy-feeds/war/WEB-INF/lib/commons-beanutils-1.8.0.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: sandbox/jiemamy-feeds/war/WEB-INF/lib/datanucleus-appengine-1.0.2.jar
===================================================================
(Binary files differ)
Deleted: sandbox/jiemamy-feeds/war/WEB-INF/lib/datanucleus-core-1.1.4.jar
===================================================================
(Binary files differ)
Deleted: sandbox/jiemamy-feeds/war/WEB-INF/lib/datanucleus-jpa-1.1.4.jar
===================================================================
(Binary files differ)
Added: sandbox/jiemamy-feeds/war/WEB-INF/lib/gaejtools-util-1.2.5-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: sandbox/jiemamy-feeds/war/WEB-INF/lib/gaejtools-util-1.2.5-SNAPSHOT.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: sandbox/jiemamy-feeds/war/WEB-INF/lib/geronimo-jpa_3.0_spec-1.1.1.jar
===================================================================
(Binary files differ)
Deleted: sandbox/jiemamy-feeds/war/WEB-INF/lib/geronimo-jta_1.1_spec-1.1.1.jar
===================================================================
(Binary files differ)
Deleted: sandbox/jiemamy-feeds/war/WEB-INF/lib/jdo2-api-2.3-ea.jar
===================================================================
(Binary files differ)
Added: sandbox/jiemamy-feeds/war/WEB-INF/lib/twitter4j-2.0.10.jar
===================================================================
(Binary files differ)
Property changes on: sandbox/jiemamy-feeds/war/WEB-INF/lib/twitter4j-2.0.10.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: sandbox/jiemamy-feeds/war/WEB-INF/lib/twitter4j-2.0.9.jar
===================================================================
(Binary files differ)
Deleted: sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-1.4.0.jar
===================================================================
(Binary files differ)
Added: sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-1.4.1.jar
===================================================================
(Binary files differ)
Property changes on: sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-1.4.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-auth-roles-1.4.0.jar
===================================================================
(Binary files differ)
Added: sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-auth-roles-1.4.1.jar
===================================================================
(Binary files differ)
Property changes on: sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-auth-roles-1.4.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-extensions-1.4.0.jar
===================================================================
(Binary files differ)
Added: sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-extensions-1.4.1.jar
===================================================================
(Binary files differ)
Property changes on: sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-extensions-1.4.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-guice-1.4.0.jar
===================================================================
(Binary files differ)
Added: sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-guice-1.4.1.jar
===================================================================
(Binary files differ)
Property changes on: sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-guice-1.4.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-ioc-1.4.0.jar
===================================================================
(Binary files differ)
Added: sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-ioc-1.4.1.jar
===================================================================
(Binary files differ)
Property changes on: sandbox/jiemamy-feeds/war/WEB-INF/lib/wicket-ioc-1.4.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: sandbox/jiemamy-feeds/war/WEB-INF/web.xml
===================================================================
--- sandbox/jiemamy-feeds/war/WEB-INF/web.xml 2009-10-05 16:20:56 UTC (rev 3707)
+++ sandbox/jiemamy-feeds/war/WEB-INF/web.xml 2009-10-05 16:21:48 UTC (rev 3708)
@@ -3,6 +3,23 @@
"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.3">
+ <servlet>
+ <servlet-name>makeSyncCall</servlet-name>
+ <servlet-class>appengine.servlet.MakeSyncCallServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>makeSyncCall</servlet-name>
+ <url-pattern>/_ah/makesynccall</url-pattern>
+ </servlet-mapping>
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>make-sync-call</web-resource-name>
+ <url-pattern>/_ah/makesynccall</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>admin</role-name>
+ </auth-constraint>
+ </security-constraint>
<!-- SessionCleanupServlet -->
<servlet>
<servlet-name>_ah_sessioncleanup</servlet-name>