Permalink
Browse files

Changes in modules and config

  • Loading branch information...
guy.mahieu
guy.mahieu committed Nov 13, 2010
1 parent 042544f commit 7d032377c6847e18fd0605364600736c3f1ef602
View
@@ -9,7 +9,6 @@
<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" />
<excludeFolder url="file://$MODULE_DIR$/lib" />
<excludeFolder url="file://$MODULE_DIR$/sample" />
</content>
<orderEntry type="inheritedJdk" />
View
@@ -2,28 +2,30 @@
<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="IvyIDEA" name="IvyIDEA">
<configuration ivyFile="C:\projects\ivyidea\trunk\sample\untitled\ivy.xml" useProjectSettings="true" useCustomIvySettings="true" ivySettingsFile="C:\projects\ivyidea\trunk\sample\untitled\ivy-settings.xml" onlyResolveSelectedConfigs="true">
<configuration ivyFile="D:\Development\ivyidea\sample\untitled\ivy.xml" useProjectSettings="true" useCustomIvySettings="true" ivySettingsFile="C:\projects\ivyidea\trunk\sample\untitled\ivy-settings.xml" onlyResolveSelectedConfigs="true">
<configsToResolve>
<config>ide</config>
<config>default</config>
</configsToResolve>
<propertiesSettings>
<propertiesFiles includeProjectLevelPropertiesFiles="true">
<fileName>C:\projects\ivyidea\trunk\sample\untitled\versions.properties</fileName>
<fileName>C:\projects\ivyidea\trunk\sample\untitled\versions-old.properties</fileName>
<fileName>D:\Development\ivyidea\sample\untitled\versions.properties</fileName>
<fileName>D:\Development\ivyidea\sample\untitled\versions-old.properties</fileName>
</propertiesFiles>
<additionalProperties includeProjectLevelAdditionalProperties="true" />
</propertiesSettings>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/ivycache" />
<excludeFolder url="file://$MODULE_DIR$/lib" />
<excludeFolder url="file://$MODULE_DIR$/repository" />
</content>
<orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library" exported="">
<library name="IvyIDEA-resolved">
<orderEntry type="module-library">
<library name="IvyIDEA--core-default">
<CLASSES>
<root url="jar://$MODULE_DIR$/ivycache/apache/commons-collections/jars/commons-collections-3.2.1.jar!/" />
</CLASSES>
@@ -2,16 +2,15 @@
<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="IvyIDEA" name="IvyIDEA">
<configuration ivyFile="C:\projects\ivyidea\trunk\sample\untitled\extensions\ivy.xml" useProjectSettings="true" useCustomIvySettings="false" ivySettingsFile="" onlyResolveSelectedConfigs="true">
<configuration ivyFile="D:\Development\ivyidea\sample\untitled\extensions\ivy.xml" useProjectSettings="true" useCustomIvySettings="false" ivySettingsFile="" onlyResolveSelectedConfigs="true">
<configsToResolve>
<config>ide</config>
<config>default</config>
</configsToResolve>
<propertiesSettings>
<propertiesFiles includeProjectLevelPropertiesFiles="true">
<fileName>C:\projects\ivyidea\trunk\sample\untitled\versions.properties</fileName>
<fileName>C:\projects\ivyidea\trunk\sample\untitled\versions-old.properties</fileName>
<fileName>D:\Development\ivyidea\sample\untitled\versions.properties</fileName>
<fileName>D:\Development\ivyidea\sample\untitled\versions-old.properties</fileName>
</propertiesFiles>
<additionalProperties includeProjectLevelAdditionalProperties="true" />
</propertiesSettings>
</configuration>
</facet>
@@ -25,16 +24,12 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="core" />
<orderEntry type="module-library">
<library name="IvyIDEA-resolved">
<library name="IvyIDEA--extensions-default">
<CLASSES>
<root url="jar://$MODULE_DIR$/../ivycache/apache/commons-collections/jars/commons-collections-3.2.1.jar!/" />
<root url="jar://$MODULE_DIR$/../ivycache/apache/commons-collections/jars/commons-collections-3.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MODULE_DIR$/../ivycache/apache/commons-collections/javadocs/commons-collections-3.2.1.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MODULE_DIR$/../ivycache/apache/commons-collections/sources/commons-collections-3.2.1.jar!/" />
</SOURCES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component>
@@ -1,6 +1,6 @@
<ivysettings>
<properties file="${my.settings.file.test}" />
<!--<properties file="${ivy.settings.dir}/ivysettings-file.properties" />-->
<!--<properties file="${my.settings.file.test}" />-->
<properties file="${ivy.settings.dir}/ivysettings-file.properties" />
<settings defaultCache="${cache.dir}" defaultResolver="internal" checkUpToDate="false" />
<resolvers>
<ibiblio name="ibiblio" />
View
@@ -3,8 +3,8 @@
xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
<info organisation="clarent" module="untitled-plugin-test-core" revision="0.1"/>
<configurations>
<conf name="${def}" description="The default minimal configuration."/>
<!--<conf name="default" description="The default minimal configuration."/>-->
<!--<conf name="${def}" description="The default minimal configuration."/>-->
<conf name="default" description="The default minimal configuration."/>
<conf name="provided" description="These dependencies are already present at runtime."/>
<conf name="test" description="These dependencies are only needed for running tests."/>
<conf name="eclipse" description="Modules for eclipse."
@@ -1,5 +1,5 @@
repository.dir=C:/Projects/ivyidea/trunk/sample/untitled/repository
cache.dir=C:/Projects/ivyidea/trunk/sample/untitled/ivycache
repository.dir=D:/Development/ivyidea/sample/untitled/repository
cache.dir=D:/Development/ivyidea/sample/untitled/ivycache
ivy.ibiblio.default.artifact.root = http://www.ibiblio.org/maven/
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project relativePaths="false" version="4">
<project version="4">
<component name="AntConfiguration">
<defaultAnt bundledAnt="true" />
</component>
@@ -10,13 +10,8 @@
<option name="PROJECT_PROFILE" />
<option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
</component>
<component name="CodeStyleSettingsManager">
<option name="PER_PROJECT_SETTINGS" />
<option name="USE_PER_PROJECT_SETTINGS" value="false" />
</component>
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
<option name="DEPLOY_AFTER_MAKE" value="0" />
<resourceExtensions>
<entry name=".+\.(properties|xml|html|dtd|tld)" />
<entry name=".+\.(gif|png|jpeg|jpg)" />
@@ -32,6 +27,10 @@
<entry name="?*.dtd" />
<entry name="?*.tld" />
</wildcardResourcePatterns>
<annotationProcessing enabled="false" useClasspath="true" />
</component>
<component name="CopyrightManager" default="">
<module2copyright />
</component>
<component name="DependenciesAnalyzeManager">
<option name="myForwardDirection" value="false" />
@@ -40,11 +39,8 @@
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
</component>
<component name="EclipseCompilerSettings">
<option name="DEBUGGING_INFO" value="true" />
<option name="GENERATE_NO_WARNINGS" value="true" />
<option name="DEPRECATION" value="false" />
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
<option name="MAXIMUM_HEAP_SIZE" value="128" />
</component>
<component name="EclipseEmbeddedCompilerSettings">
<option name="DEBUGGING_INFO" value="true" />
@@ -71,35 +67,15 @@
</autodetection-disabled>
</component>
<component name="IdProvider" IDEtalkID="DAA3042B9C5A78BBBE98FDA04E29D167" />
<component name="InspectionProjectProfileManager">
<option name="PROJECT_PROFILE" value="Project Default" />
<option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
<scopes />
<profiles>
<profile version="1.0" is_locked="false">
<option name="myName" value="Project Default" />
<option name="myLocal" value="false" />
</profile>
</profiles>
<list size="0" />
</component>
<component name="IvyIDEA.ProjectSettings">
<option name="ivySettingsFile" value="C:\projects\ivyidea\trunk\sample\untitled\ivy-settings.xml" />
<option name="ivyLogLevelThreshold" value="Warning" />
<option name="ivySettingsFile" value="D:\Development\ivyidea\sample\untitled\ivy-settings.xml" />
<option name="libraryNameIncludesConfiguration" value="true" />
<option name="libraryNameIncludesModule" value="true" />
<option name="propertiesSettings">
<PropertiesSettings>
<option name="additionalProperties">
<SortedProperties />
</option>
</PropertiesSettings>
<PropertiesSettings />
</option>
</component>
<component name="JavacSettings">
<option name="DEBUGGING_INFO" value="true" />
<option name="GENERATE_NO_WARNINGS" value="false" />
<option name="DEPRECATION" value="true" />
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
<option name="MAXIMUM_HEAP_SIZE" value="128" />
</component>
<component name="JavadocGenerationManager">
<option name="OUTPUT_DIRECTORY" />
<option name="OPTION_SCOPE" value="protected" />
@@ -117,14 +93,6 @@
<option name="LOCALE" />
<option name="OPEN_IN_BROWSER" value="true" />
</component>
<component name="JikesSettings">
<option name="JIKES_PATH" value="" />
<option name="DEBUGGING_INFO" value="true" />
<option name="DEPRECATION" value="true" />
<option name="GENERATE_NO_WARNINGS" value="false" />
<option name="IS_EMACS_ERRORS_MODE" value="true" />
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
</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">
@@ -249,12 +217,10 @@
<component name="ProjectDetails">
<option name="projectName" value="untitled" />
</component>
<component name="ProjectFileVersion" converted="true" />
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/core.iml" filepath="$PROJECT_DIR$/core.iml" />
<module fileurl="file://$PROJECT_DIR$/extensions/extensions.iml" filepath="$PROJECT_DIR$/extensions/extensions.iml" />
<module fileurl="file://$PROJECT_DIR$/untitled/untitled.iml" filepath="$PROJECT_DIR$/untitled/untitled.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
@@ -267,15 +233,9 @@
</value>
</option>
</component>
<component name="RmicSettings">
<option name="IS_EANABLED" value="false" />
<option name="DEBUGGING_INFO" value="true" />
<option name="GENERATE_NO_WARNINGS" value="false" />
<option name="GENERATE_IIOP_STUBS" value="false" />
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
</component>
<component name="SvnBranchConfigurationManager">
<option name="myVersion" value="124" />
<option name="mySupportsUserInfoFilter" value="true" />
</component>
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="" />

0 comments on commit 7d03237

Please sign in to comment.