Skip to content

S
solo
Commit bbfe07ad authored by Liang Ding's avatar Liang Ding
Browse files
Options

升级到 Latke 1.0.0 

Latke 1.0.0 已经上传 Maven 中央库了 :-p
parent 60269ea4
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 106 deletions
.gitignore
View file @ bbfe07ad
...@@ -10,3 +10,4 @@ ...@@ -10,3 +10,4 @@
.idea/ .idea/
.DS_Store .DS_Store
/target/
\ No newline at end of file
core/solo-core.iml
View file @ bbfe07ad
...@@ -5,22 +5,21 @@ ...@@ -5,22 +5,21 @@
<output-test url="file://$MODULE_DIR$/target/test-classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" /> <excludeFolder url="file://$MODULE_DIR$/target" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.5.10" level="project" /> <orderEntry type="library" name="Maven: org.b3log:latke:1.0.0" level="project" />
<orderEntry type="library" name="Maven: org.b3log:latke:0.5.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: javax.enterprise:cdi-api:1.0" level="project" /> <orderEntry type="library" name="Maven: javax.enterprise:cdi-api:1.0" level="project" />
<orderEntry type="library" name="Maven: org.jboss.interceptor:jboss-interceptor-api:1.1" level="project" /> <orderEntry type="library" name="Maven: org.jboss.interceptor:jboss-interceptor-api:1.1" level="project" />
<orderEntry type="library" name="Maven: javax.annotation:jsr250-api:1.0" level="project" /> <orderEntry type="library" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
<orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" /> <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
<orderEntry type="library" name="Maven: javax.el:el-api:1.0" level="project" /> <orderEntry type="library" name="Maven: javax.el:el-api:1.0" level="project" />
<orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.19" level="project" /> <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.20" level="project" />
<orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" /> <orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" />
<orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" /> <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" />
...@@ -39,7 +38,7 @@ ...@@ -39,7 +38,7 @@
<orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.12" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.12" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.6" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.6" level="project" />
<orderEntry type="library" name="Maven: org.jsoup:jsoup:1.5.2" level="project" /> <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.5.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.b3log:latke-gae:0.5.0-SNAPSHOT" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.b3log:latke-gae:1.0.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.google.appengine:appengine-api-1.0-sdk:1.8.1.1" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: com.google.appengine:appengine-api-1.0-sdk:1.8.1.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.google.appengine:appengine-api-labs:1.8.1.1" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: com.google.appengine:appengine-api-labs:1.8.1.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.google.appengine:appengine-api-stubs:1.8.1.1" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: com.google.appengine:appengine-api-stubs:1.8.1.1" level="project" />
......
core/src/main/java/org/b3log/solo/service/PluginQueryService.java
View file @ bbfe07ad
...@@ -156,7 +156,7 @@ public class PluginQueryService { ...@@ -156,7 +156,7 @@ public class PluginQueryService {
throw new ServiceException("can not find plugin[" + pluginId + "]"); throw new ServiceException("can not find plugin[" + pluginId + "]");
} }
return ret.optString(Plugin.PLUGIN_SETTING).toString(); return ret.optString(Plugin.PLUGIN_SETTING);
} }
/** /**
......
core/src/test/java/org/b3log/solo/service/PreferenceMgmtServiceTestCase.java
View file @ bbfe07ad
...@@ -90,8 +90,7 @@ public class PreferenceMgmtServiceTestCase extends AbstractTestCase { ...@@ -90,8 +90,7 @@ public class PreferenceMgmtServiceTestCase extends AbstractTestCase {
preferenceQueryService.getReplyNotificationTemplate(); preferenceQueryService.getReplyNotificationTemplate();
Assert.assertEquals(replyNotificationTemplate.toString(), Assert.assertEquals(replyNotificationTemplate.toString(),
Preference.Default.DEFAULT_REPLY_NOTIFICATION_TEMPLATE. Preference.Default.DEFAULT_REPLY_NOTIFICATION_TEMPLATE);
toString());
replyNotificationTemplate.put("subject", "updated subject"); replyNotificationTemplate.put("subject", "updated subject");
preferenceMgmtService.updateReplyNotificationTemplate( preferenceMgmtService.updateReplyNotificationTemplate(
......
core/src/test/java/org/b3log/solo/service/PreferenceQueryServiceTestCase.java
View file @ bbfe07ad
...@@ -79,7 +79,6 @@ public class PreferenceQueryServiceTestCase extends AbstractTestCase { ...@@ -79,7 +79,6 @@ public class PreferenceQueryServiceTestCase extends AbstractTestCase {
preferenceQueryService.getReplyNotificationTemplate(); preferenceQueryService.getReplyNotificationTemplate();
Assert.assertEquals(replyNotificationTemplate.toString(), Assert.assertEquals(replyNotificationTemplate.toString(),
Preference.Default.DEFAULT_REPLY_NOTIFICATION_TEMPLATE. Preference.Default.DEFAULT_REPLY_NOTIFICATION_TEMPLATE);
toString());
} }
} }
pom.xml
View file @ bbfe07ad
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Description: B3log Solo parent POM. Description: B3log Solo parent POM.
Version: 2.0.3.4, Nov 13, 2013 Version: 2.0.3.5, Jan 24, 2014
Author: Liang Ding Author: Liang Ding
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
...@@ -29,10 +29,7 @@ ...@@ -29,10 +29,7 @@
<properties> <properties>
<servlet.version>2.5</servlet.version> <servlet.version>2.5</servlet.version>
<slf4j.version>1.7.5</slf4j.version> <slf4j.version>1.7.5</slf4j.version>
<org.b3log.latke.version>0.5.0-SNAPSHOT</org.b3log.latke.version> <org.b3log.latke.version>1.0.0</org.b3log.latke.version>
<org.b3log.latke-gae.version>0.5.0-SNAPSHOT</org.b3log.latke-gae.version>
<org.b3log.latke-repository-mysql.version>0.5.0-SNAPSHOT</org.b3log.latke-repository-mysql.version>
<org.b3log.latke-repository-h2.version>0.5.0-SNAPSHOT</org.b3log.latke-repository-h2.version>
<maven-gae-plugin.version>0.9.0</maven-gae-plugin.version> <maven-gae-plugin.version>0.9.0</maven-gae-plugin.version>
<gae.version>1.8.1.1</gae.version> <gae.version>1.8.1.1</gae.version>
...@@ -168,19 +165,19 @@ ...@@ -168,19 +165,19 @@
<dependency> <dependency>
<groupId>org.b3log</groupId> <groupId>org.b3log</groupId>
<artifactId>latke-gae</artifactId> <artifactId>latke-gae</artifactId>
<version>${org.b3log.latke-gae.version}</version> <version>${org.b3log.latke.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.b3log</groupId> <groupId>org.b3log</groupId>
<artifactId>latke-repository-mysql</artifactId> <artifactId>latke-repository-mysql</artifactId>
<version>${org.b3log.latke-repository-mysql.version}</version> <version>${org.b3log.latke.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.b3log</groupId> <groupId>org.b3log</groupId>
<artifactId>latke-repository-h2</artifactId> <artifactId>latke-repository-h2</artifactId>
<version>${org.b3log.latke-repository-h2.version}</version> <version>${org.b3log.latke.version}</version>
</dependency> </dependency>
<dependency> <dependency>
......
solo.iml
View file @ bbfe07ad
...@@ -3,9 +3,8 @@ ...@@ -3,9 +3,8 @@
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" /> <output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" />
<exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" /> <excludeFolder url="file://$MODULE_DIR$/target" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
......
war/gae/solo-gae.iml
View file @ bbfe07ad
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="web" name="Web">
<configuration>
<descriptors>
<deploymentDescriptor name="context.xml" url="file://$MODULE_DIR$/../src/main/webapp/META-INF/context.xml" />
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/../src/main/webapp/WEB-INF/web.xml" />
</descriptors>
<webroots>
<root url="file://$MODULE_DIR$/../src/main/webapp" relative="/" />
</webroots>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" /> <output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" />
...@@ -21,7 +8,7 @@ ...@@ -21,7 +8,7 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.b3log:latke:0.5.0-SNAPSHOT" level="project" /> <orderEntry type="library" name="Maven: org.b3log:latke:1.0.0" level="project" />
<orderEntry type="library" name="Maven: javax.enterprise:cdi-api:1.0" level="project" /> <orderEntry type="library" name="Maven: javax.enterprise:cdi-api:1.0" level="project" />
<orderEntry type="library" name="Maven: org.jboss.interceptor:jboss-interceptor-api:1.1" level="project" /> <orderEntry type="library" name="Maven: org.jboss.interceptor:jboss-interceptor-api:1.1" level="project" />
<orderEntry type="library" name="Maven: javax.annotation:jsr250-api:1.0" level="project" /> <orderEntry type="library" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
...@@ -31,13 +18,13 @@ ...@@ -31,13 +18,13 @@
<orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.5" level="project" /> <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.5" level="project" />
<orderEntry type="library" name="Maven: javassist:javassist:3.12.1.GA" level="project" /> <orderEntry type="library" name="Maven: javassist:javassist:3.12.1.GA" level="project" />
<orderEntry type="library" name="Maven: org.b3log:latke-gae:0.5.0-SNAPSHOT" level="project" /> <orderEntry type="library" name="Maven: org.b3log:latke-gae:1.0.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.google.appengine:appengine-api-1.0-sdk:1.8.1.1" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.appengine:appengine-api-1.0-sdk:1.8.1.1" level="project" />
<orderEntry type="module" module-name="solo-core" /> <orderEntry type="module" module-name="solo-core" />
<orderEntry type="library" name="Maven: org.jsoup:jsoup:1.5.2" level="project" /> <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.5.2" level="project" />
<orderEntry type="library" name="Maven: org.tautua.markdownpapers:markdownpapers-core:1.3.2" level="project" /> <orderEntry type="library" name="Maven: org.tautua.markdownpapers:markdownpapers-core:1.3.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-jdk14:1.7.5" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-jdk14:1.7.5" level="project" />
<orderEntry type="library" name="Maven: org.freemarker:freemarker-gae:2.3.19" level="project" /> <orderEntry type="library" name="Maven: org.freemarker:freemarker-gae:2.3.20" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.1.1" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.1.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
......
war/h2/pom.xml
View file @ bbfe07ad
...@@ -52,11 +52,6 @@ ...@@ -52,11 +52,6 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.b3log</groupId>
<artifactId>solo-core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.b3log</groupId> <groupId>org.b3log</groupId>
<artifactId>latke-repository-h2</artifactId> <artifactId>latke-repository-h2</artifactId>
......
war/h2/solo-h2.iml
View file @ bbfe07ad
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="web" name="Web">
<configuration>
<descriptors>
<deploymentDescriptor name="context.xml" url="file://$MODULE_DIR$/../src/main/webapp/META-INF/context.xml" />
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/../src/main/webapp/WEB-INF/web.xml" />
</descriptors>
<webroots>
<root url="file://$MODULE_DIR$/../src/main/webapp" relative="/" />
</webroots>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" /> <output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" />
...@@ -21,16 +8,14 @@ ...@@ -21,16 +8,14 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.5.10" level="project" /> <orderEntry type="library" name="Maven: org.b3log:latke:1.0.0" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.5.10" level="project" />
<orderEntry type="library" name="Maven: org.b3log:latke:0.5.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: javax.enterprise:cdi-api:1.0" level="project" /> <orderEntry type="library" name="Maven: javax.enterprise:cdi-api:1.0" level="project" />
<orderEntry type="library" name="Maven: org.jboss.interceptor:jboss-interceptor-api:1.1" level="project" /> <orderEntry type="library" name="Maven: org.jboss.interceptor:jboss-interceptor-api:1.1" level="project" />
<orderEntry type="library" name="Maven: javax.annotation:jsr250-api:1.0" level="project" /> <orderEntry type="library" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
<orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" /> <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
<orderEntry type="library" name="Maven: javax.el:el-api:1.0" level="project" /> <orderEntry type="library" name="Maven: javax.el:el-api:1.0" level="project" />
<orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.19" level="project" /> <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.20" level="project" />
<orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" /> <orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" />
<orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" /> <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" />
...@@ -40,12 +25,12 @@ ...@@ -40,12 +25,12 @@
<orderEntry type="library" name="Maven: org.jboss:jboss-vfs:3.1.0.Final" level="project" /> <orderEntry type="library" name="Maven: org.jboss:jboss-vfs:3.1.0.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.0.0.CR1" level="project" /> <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.0.0.CR1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
<orderEntry type="library" name="Maven: org.b3log:latke-repository-h2:1.0.0" level="project" />
<orderEntry type="module" module-name="solo-core" /> <orderEntry type="module" module-name="solo-core" />
<orderEntry type="library" name="Maven: org.jsoup:jsoup:1.5.2" level="project" /> <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.5.2" level="project" />
<orderEntry type="library" name="Maven: org.tautua.markdownpapers:markdownpapers-core:1.3.2" level="project" /> <orderEntry type="library" name="Maven: org.tautua.markdownpapers:markdownpapers-core:1.3.2" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.5" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.5" level="project" />
<orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" /> <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
<orderEntry type="library" name="Maven: org.b3log:latke-repository-h2:0.5.0-SNAPSHOT" level="project" />
</component> </component>
</module> </module>
war/mysql/pom.xml
View file @ bbfe07ad
...@@ -48,11 +48,6 @@ ...@@ -48,11 +48,6 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.b3log</groupId>
<artifactId>solo-core</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.b3log</groupId> <groupId>org.b3log</groupId>
<artifactId>latke-repository-mysql</artifactId> <artifactId>latke-repository-mysql</artifactId>
......
war/mysql/solo-mysql.iml
View file @ bbfe07ad
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="web" name="Web">
<configuration>
<descriptors>
<deploymentDescriptor name="context.xml" url="file://$MODULE_DIR$/../src/main/webapp/META-INF/context.xml" />
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/../src/main/webapp/WEB-INF/web.xml" />
</descriptors>
<webroots>
<root url="file://$MODULE_DIR$/../src/main/webapp" relative="/" />
</webroots>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" /> <output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" />
...@@ -21,16 +8,14 @@ ...@@ -21,16 +8,14 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.5.10" level="project" /> <orderEntry type="library" name="Maven: org.b3log:latke:1.0.0" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.5.10" level="project" />
<orderEntry type="library" name="Maven: org.b3log:latke:0.5.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: javax.enterprise:cdi-api:1.0" level="project" /> <orderEntry type="library" name="Maven: javax.enterprise:cdi-api:1.0" level="project" />
<orderEntry type="library" name="Maven: org.jboss.interceptor:jboss-interceptor-api:1.1" level="project" /> <orderEntry type="library" name="Maven: org.jboss.interceptor:jboss-interceptor-api:1.1" level="project" />
<orderEntry type="library" name="Maven: javax.annotation:jsr250-api:1.0" level="project" /> <orderEntry type="library" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
<orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" /> <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
<orderEntry type="library" name="Maven: javax.el:el-api:1.0" level="project" /> <orderEntry type="library" name="Maven: javax.el:el-api:1.0" level="project" />
<orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.19" level="project" /> <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.20" level="project" />
<orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" /> <orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" />
<orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" /> <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" />
...@@ -42,13 +27,13 @@ ...@@ -42,13 +27,13 @@
<orderEntry type="library" name="Maven: org.jboss:jboss-vfs:3.1.0.Final" level="project" /> <orderEntry type="library" name="Maven: org.jboss:jboss-vfs:3.1.0.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.0.0.CR1" level="project" /> <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.0.0.CR1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
<orderEntry type="library" name="Maven: org.b3log:latke-repository-mysql:1.0.0" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.18" level="project" />
<orderEntry type="module" module-name="solo-core" /> <orderEntry type="module" module-name="solo-core" />
<orderEntry type="library" name="Maven: org.jsoup:jsoup:1.5.2" level="project" /> <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.5.2" level="project" />
<orderEntry type="library" name="Maven: org.tautua.markdownpapers:markdownpapers-core:1.3.2" level="project" /> <orderEntry type="library" name="Maven: org.tautua.markdownpapers:markdownpapers-core:1.3.2" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.5" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.5" level="project" />
<orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" /> <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
<orderEntry type="library" name="Maven: org.b3log:latke-repository-mysql:0.5.0-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.18" level="project" />
</component> </component>
</module> </module>
war/pom.xml
View file @ bbfe07ad
...@@ -71,8 +71,6 @@ ...@@ -71,8 +71,6 @@
<webAppSourceDirectory>../src/main/webapp</webAppSourceDirectory> <webAppSourceDirectory>../src/main/webapp</webAppSourceDirectory>
<classesDirectory>${basedir}/target/${project.build.finalName}/WEB-INF/classes</classesDirectory> <classesDirectory>${basedir}/target/${project.build.finalName}/WEB-INF/classes</classesDirectory>
<contextPath>/</contextPath>
<systemProperties> <systemProperties>
<systemProperty> <systemProperty>
<name>org.eclipse.jetty.server.Request.maxFormContentSize</name> <name>org.eclipse.jetty.server.Request.maxFormContentSize</name>
......
war/solo-war.iml
View file @ bbfe07ad
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="web" name="Web">
<configuration>
<descriptors>
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
</descriptors>
<webroots>
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
</webroots>
</configuration>
<facet type="google-app-engine" name="Google App Engine">
<configuration />
</facet>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" /> <output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" />
<exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" /> <excludeFolder url="file://$MODULE_DIR$/target" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.5.10" level="project" />
<orderEntry type="module" module-name="solo-core" /> <orderEntry type="module" module-name="solo-core" />
<orderEntry type="library" name="Maven: org.b3log:latke:0.5.0-SNAPSHOT" level="project" /> <orderEntry type="library" name="Maven: org.b3log:latke:1.0.0" level="project" />
<orderEntry type="library" name="Maven: javax.enterprise:cdi-api:1.0" level="project" /> <orderEntry type="library" name="Maven: javax.enterprise:cdi-api:1.0" level="project" />
<orderEntry type="library" name="Maven: org.jboss.interceptor:jboss-interceptor-api:1.1" level="project" /> <orderEntry type="library" name="Maven: org.jboss.interceptor:jboss-interceptor-api:1.1" level="project" />
<orderEntry type="library" name="Maven: javax.annotation:jsr250-api:1.0" level="project" /> <orderEntry type="library" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
<orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" /> <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
<orderEntry type="library" name="Maven: javax.el:el-api:1.0" level="project" /> <orderEntry type="library" name="Maven: javax.el:el-api:1.0" level="project" />
<orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.19" level="project" /> <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.20" level="project" />
<orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" /> <orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" />
<orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" /> <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment