svnno****@sourc*****
svnno****@sourc*****
2008年 9月 24日 (水) 03:53:19 JST
Revision: 1959
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=jiemamy&view=rev&rev=1959
Author: shin1
Date: 2008-09-24 03:53:19 +0900 (Wed, 24 Sep 2008)
Log Message:
-----------
[CORE-76]実装クラスのパッケージ名には"spec"を含まないように修正。
Modified Paths:
--------------
sandbox/org.jiemamy.core.eventcodegen/trunk/org.jiemamy.core.eventcodegen/src/main/java/org/jiemamy/core/eventcodegen/JiemamyModelDoclet.java
-------------- next part --------------
Modified: sandbox/org.jiemamy.core.eventcodegen/trunk/org.jiemamy.core.eventcodegen/src/main/java/org/jiemamy/core/eventcodegen/JiemamyModelDoclet.java
===================================================================
--- sandbox/org.jiemamy.core.eventcodegen/trunk/org.jiemamy.core.eventcodegen/src/main/java/org/jiemamy/core/eventcodegen/JiemamyModelDoclet.java 2008-09-23 18:53:07 UTC (rev 1958)
+++ sandbox/org.jiemamy.core.eventcodegen/trunk/org.jiemamy.core.eventcodegen/src/main/java/org/jiemamy/core/eventcodegen/JiemamyModelDoclet.java 2008-09-23 18:53:19 UTC (rev 1959)
@@ -33,10 +33,10 @@
public class JiemamyModelDoclet extends Doclet {
public List<JiemamyModel> model;
public Map<Class<?>, CollectionProperty> collectionProperties = new HashMap<Class<?>, CollectionProperty>();
- public static final String OUTPUTDIR_SPECS = "src/main/java/";
- public static final String OUTPUTDIR_IMPLEMENTS = "src/main/java/";
- // public static final String OUTPUTDIR_IMPLEMENTS = "../org.jiemamy.core/src/main/java/";
-// public static final String OUTPUTDIR_SPECS = "../org.jiemamy.spec.event/src/main/java/";
+// public static final String OUTPUTDIR_SPECS = "src/main/java/";
+// public static final String OUTPUTDIR_IMPLEMENTS = "src/main/java/";
+ public static final String OUTPUTDIR_IMPLEMENTS = "../org.jiemamy.event/src/main/java/";
+ public static final String OUTPUTDIR_SPECS = "../org.jiemamy.spec.event/src/main/java/";
public static LanguageVersion languageVersion() {
return LanguageVersion.JAVA_1_5;
@@ -165,13 +165,15 @@
if (!dirForSpec.exists()) {
dirForSpec.mkdirs();
}
+ // 実装のパッケージ名には"spec"を含まない。
File dirForImpl = new File(OUTPUTDIR_IMPLEMENTS
- + packageName.replaceAll("\\.", "/"));
+ + packageName.replaceAll("\\.spec", "").replaceAll("\\.", "/"));
if (!dirForImpl.exists()) {
dirForImpl.mkdirs();
}
VelocityContext velocityContext = new VelocityContext();
- velocityContext.put("package", packageName);
+ // 実装のパッケージ名には"spec"を含まない。
+ velocityContext.put("package", packageName.replaceAll("\\.spec", ""));
velocityContext.put("importClasses", importClasses);
velocityContext.put("modelClassName", classDoc.name().toString());
velocityContext.put("modelClassNameLower", classDoc.name()