重新组织主题插件文件结构

.gitignore

@@ -1,64 +1,5 @@
-# ---> WebStorm
+*.iml
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+.idea/
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+.classpath
-
+.DS_Store
-# User-specific stuff:
+lib/report/*.jar
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/dictionaries
-
-# Sensitive or high-churn files:
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.xml
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-
-# Gradle:
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# CMake
-cmake-build-debug/
-
-# Mongo Explorer plugin:
-.idea/**/mongoSettings.xml
-
-## File-based project format:
-*.iws
-
-## Plugin-specific files:
-
-# IntelliJ
-/out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Cursive Clojure plugin
-.idea/replstate.xml
-
-# Ruby plugin and RubyMine
-/.rakeTasks
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-### WebStorm Patch ###
-# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
-
-# *.iml
-# modules.xml
-# .idea/misc.xml
-# *.ipr
-
-# Sonarlint plugin
-.idea/sonarlint

README.md

@@ -1,4 +1,5 @@
 # demo-theme-original
 
-主题插件示例
+主题插件示例效果图
-![](theme.png)
+
+![style](screenshots/theme.png)

build.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project basedir="." default="jar" name="plugin">
     <!-- JDK路径，根据自己机器上实际位置修改-->
-    <property name="jdk.home" value="C:\Program Files\Java\jdk1.8.0_171"/>
+    <property name="jdk.home" value="/Library/Java/JavaVirtualMachines/jdk1.8/Contents/Home"/>
 
     <property name="libs" value="${basedir}/lib"/>
     <property name="publicLibs" value=""/>
+    <property name="reportLibs" value="${basedir}/../webroot/WEB-INF/lib"/>
     <property name="destLoc" value="."/>
     <property name="classes" value="classes"/>
-
     <xmlproperty file="${basedir}/plugin.xml"/>
     <property name="current-version" value="${plugin.version}"/>
 
@@ -30,6 +30,9 @@
         <fileset dir="${publicLibs}">
             <include name="**/*.jar"/>
         </fileset>
+        <fileset dir="${reportLibs}">
+            <include name="**/*.jar"/>
+        </fileset>
     </path>
     <patternset id="resources4Jar">
         <exclude name="**/.settings/**"/>
@@ -45,7 +48,7 @@
         <echo message="从${resources_from}拷贝图片,JS,CSS等资源文件"/>
         <delete dir="tmp"/>
         <copy todir="tmp">
-            <fileset dir="${resources_from}\src">
+            <fileset dir="${resources_from}/src/main/resources">
                 <patternset refid="resources4Jar"/>
             </fileset>
         </copy>
@@ -60,11 +63,15 @@
                target="${target_jdk_version}"
                fork="true" memoryMaximumSize="512m" listfiles="false" srcdir="${basedir}"
                executable="${compile_jdk_version}/bin/javac">
-            <src path="${basedir}/src"/>
+            <src path="${basedir}/src/main/java"/>
             <exclude name="**/.svn/**"/>
             <compilerarg line="-encoding UTF8 "/>
             <classpath refid="compile.classpath"/>
         </javac>
+        <taskdef name="pretreatment" classname="com.fr.plugin.pack.PluginPretreatmentTask">
+            <classpath refid="compile.classpath"/>
+        </taskdef>
+        <pretreatment baseDir="${basedir}"/>
     </target>
 
     <target name="jar_classes">
@@ -94,6 +101,7 @@
         <delete dir="${classes}"/>
 
     </target>
+
     <target name="jar" depends="super_jar">
         <antcall target="zip"/>
     </target>
@@ -107,12 +115,16 @@
                 <include name="${plugin-jar}"/>
                 <include name="plugin.xml"/>
             </fileset>
+            <fileset dir="${libs}">
+                <include name="*.jar"/>
+                <include name="*.dll"/>
+            </fileset>
         </copy>
         <zip destfile="${basedir}/${plugin-folder}.zip" basedir=".">
             <include name="${plugin-folder}/*.jar"/>
+            <include name="${plugin-folder}/*.dll"/>
             <include name="${plugin-folder}/plugin.xml"/>
         </zip>
-        <xmlproperty file="${basedir}/plugin.xml"/>
+        <move file="${plugin-folder}.zip" todir="${destLoc}/install"/>
-        <move file="${plugin-folder}.zip" todir="${destLoc}/${plugin.name}"/>
     </target>
 </project>

demo-theme-original.iml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6">
+    <output url="file://$MODULE_DIR$/../webroot/WEB-INF/plugins/plugin-com.fr.plugin.decision.theme.original-1.0/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: com.fr.third:fine-third:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.activator:fine-activator:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.core:fine-core:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.17" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.webui:fine-webui:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.datasource:fine-datasource:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.decision:fine-decision:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.decision:fine-decision-report:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.schedule:fine-schedule:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.schedule:fine-schedule-report:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.intelligence:fine-swift:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fineio:fineio:2.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.third.server:servlet-api:3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.intelligence:fine-accumulator:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.report:fine-report-engine:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fr.report:fine-report-designer:10.0-RELEASE-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: io.socket:socket.io-client:0.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.socket:engine.io-client:0.7.0" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp-ws:3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.6.0" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20090211" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.6.9" level="project" />
+    <orderEntry type="library" name="Maven: org.swingexplorer:swexpl:2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.swingexplorer:swag:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-catalina:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-servlet-api:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jsp-api:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-el-api:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-annotations-api:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-api:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jni:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-coyote:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-util:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-util-scan:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jaspic-api:8.5.32" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.44" level="project" />
+  </component>
+</module>

pom.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.fr.plugin</groupId>
+        <artifactId>starter</artifactId>
+        <version>10.0</version>
+    </parent>
+    <packaging>jar</packaging>
+    <artifactId>demo-theme-original</artifactId>
+    <build>
+        <!---如果要更改调试插件，改这里的配置就可以了-->
+        <outputDirectory>${project.basedir}/../webroot/WEB-INF/plugins/plugin-com.fr.plugin.decision.theme.original-1.0/classes</outputDirectory>
+    </build>
+</project>