Author: julien(a)jboss.com
Date: 2007-09-18 17:12:13 -0400 (Tue, 18 Sep 2007)
New Revision: 8341
Added:
modules/common/trunk/build/ide/intellij/idea60/modules/mc/
modules/common/trunk/build/ide/intellij/idea60/modules/mc/mc.iml
modules/common/trunk/mc/src/main/java/
modules/common/trunk/mc/src/main/java/org/
modules/common/trunk/portal/src/main/java/
modules/common/trunk/portal/src/main/java/org/
Removed:
modules/common/trunk/mc/src/main/org/
modules/common/trunk/portal/src/main/org/
Modified:
modules/common/trunk/build/ide/intellij/idea60/jboss-portal-common.ipr
modules/common/trunk/build/ide/intellij/idea60/modules/portal/portal.iml
modules/common/trunk/tools/etc/buildfragments/buildmagic.ent
Log:
update portal and mc sub modules of common module to match the directory reorg of the
common/common
Modified: modules/common/trunk/build/ide/intellij/idea60/jboss-portal-common.ipr
===================================================================
--- modules/common/trunk/build/ide/intellij/idea60/jboss-portal-common.ipr 2007-09-18
19:31:58 UTC (rev 8340)
+++ modules/common/trunk/build/ide/intellij/idea60/jboss-portal-common.ipr 2007-09-18
21:12:13 UTC (rev 8341)
@@ -129,6 +129,32 @@
<option name="FILTER_INFO" value="true" />
<option name="CUSTOM_FILTER" />
</component>
+ <component name="MavenBuildProjectComponent">
+ <option name="mavenExecutable" value="" />
+ <option name="Settings File" value="" />
+ <option name="mavenCommandLineParams" value="" />
+ <option name="vmOptions" value="" />
+ <option name="useMavenEmbedder" value="false" />
+ <option name="useFilter" value="false" />
+ <option name="Batch Mode" value="false" />
+ <option name="Check Plugin Updates" value="false" />
+ <option name="Debug" value="false" />
+ <option name="Errors" value="false" />
+ <option name="Fail At End" value="false" />
+ <option name="Fail Fast" value="false" />
+ <option name="Fail Never" value="false" />
+ <option name="Lax Checksums" value="false" />
+ <option name="No Plugin Registry" value="false" />
+ <option name="No Plugin Updates" value="false" />
+ <option name="Non Recursive" value="false" />
+ <option name="Offline" value="false" />
+ <option name="Reactor" value="false" />
+ <option name="Strict Checksums" value="false" />
+ <option name="Update Plugins" value="false" />
+ <option name="Update Snapshots" value="false" />
+ <option name="Skip Tests" value="false" />
+ <pom-list />
+ </component>
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer"
tooltip-text="Horizontal Spacer"
icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false"
auto-create-binding="false" can-attach-label="false">
@@ -253,6 +279,7 @@
<component name="ProjectModuleManager">
<modules>
<module
fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/common/common.iml"
filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/common/common.iml"
/>
+ <module
fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/mc/mc.iml"
filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/mc/mc.iml" />
<module
fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/portal/portal.iml"
filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/portal/portal.iml"
/>
<module
fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/testsuite/testsuite.iml"
filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/testsuite/testsuite.iml"
/>
<module
fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml"
filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml"
/>
Added: modules/common/trunk/build/ide/intellij/idea60/modules/mc/mc.iml
===================================================================
--- modules/common/trunk/build/ide/intellij/idea60/modules/mc/mc.iml
(rev 0)
+++ modules/common/trunk/build/ide/intellij/idea60/modules/mc/mc.iml 2007-09-18 21:12:13
UTC (rev 8341)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true"
type="JAVA_MODULE">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager"
inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$/../../../../../../mc">
+ <sourceFolder
url="file://$MODULE_DIR$/../../../../../../mc/src/main/java"
isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntryProperties />
+ </component>
+</module>
+
Modified: modules/common/trunk/build/ide/intellij/idea60/modules/portal/portal.iml
===================================================================
--- modules/common/trunk/build/ide/intellij/idea60/modules/portal/portal.iml 2007-09-18
19:31:58 UTC (rev 8340)
+++ modules/common/trunk/build/ide/intellij/idea60/modules/portal/portal.iml 2007-09-18
21:12:13 UTC (rev 8341)
@@ -4,7 +4,7 @@
<component name="NewModuleRootManager"
inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$/../../../../../../portal">
- <sourceFolder
url="file://$MODULE_DIR$/../../../../../../portal/src/main"
isTestSource="false" />
+ <sourceFolder
url="file://$MODULE_DIR$/../../../../../../portal/src/main/java"
isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Copied: modules/common/trunk/mc/src/main/java/org (from rev 8340,
modules/common/trunk/mc/src/main/org)
Copied: modules/common/trunk/portal/src/main/java/org (from rev 8340,
modules/common/trunk/portal/src/main/org)
Modified: modules/common/trunk/tools/etc/buildfragments/buildmagic.ent
===================================================================
--- modules/common/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-18 19:31:58 UTC
(rev 8340)
+++ modules/common/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-18 21:12:13 UTC
(rev 8341)
@@ -408,7 +408,7 @@
<mkdir dir="${build.test.classes}"/>
<!-- Hack, required to avoid duplicate javac targets -->
- <mkdir dir="${build.gen.test}"/>
+ <mkdir dir="${build.test.gen}"/>
<!-- Remove classes which depend on changed files, so they will rebuild. -->
<depend srcdir="${source.test.classes}"
Show replies by date