Revision: 840
http://stripes.svn.sourceforge.net/stripes/?rev=840&view=rev
Author: tfenne
Date: 2008-02-05 18:38:02 -0800 (Tue, 05 Feb 2008)
Log Message:
-----------
Updated IntellJ project files.
Modified Paths:
--------------
trunk/examples/Examples.iml
trunk/stripes/stripes.iml
trunk/stripes.ipr
trunk/tests/tests.iml
Modified: trunk/examples/Examples.iml
===================================================================
--- trunk/examples/Examples.iml 2008-02-05 17:53:25 UTC (rev 839)
+++ trunk/examples/Examples.iml 2008-02-06 02:38:02 UTC (rev 840)
@@ -1,7 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="J2EE_WEB_MODULE"
j2ee-integration="Tomcat Server">
- <component name="AppServerSpecificValidatorsManager" />
- <component name="ModuleRootManager" />
+<module relativePaths="true" j2ee-integration="Tomcat Server"
type="J2EE_WEB_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="web" name="Web">
+ <configuration>
+ <descriptors>
+ <deploymentDescriptor name="web.xml"
url="file://$MODULE_DIR$/web/WEB-INF/web.xml" optional="false" version="2.5" />
+ </descriptors>
+ <webroots>
+ <root url="file://$MODULE_DIR$/web" relative="/" />
+ </webroots>
+ <sourceRoots>
+ <root url="file://$MODULE_DIR$/src" />
+ </sourceRoots>
+ <building>
+ <setting name="EXPLODED_URL" value="file://" />
+ <setting name="EXPLODED_ENABLED" value="false" />
+ <setting name="JAR_URL" value="file://" />
+ <setting name="JAR_ENABLED" value="false" />
+ <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
+ <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
+ <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" />
+ <setting name="RUN_JASPER_VALIDATION" value="true" />
+ <setting name="BUILD_ONLY_WEB_RESOURCES" value="false" />
+ </building>
+ <packaging>
+ <containerElement type="module" name="Examples">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/classes" />
+ </containerElement>
+ </packaging>
+ </configuration>
+ </facet>
+ </component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/web/WEB-INF/classes" />
<exclude-output />
@@ -39,6 +69,15 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$APPLICATION_HOME_DIR$/lib/javaee.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="WebModuleBuildComponent">
@@ -117,6 +156,5 @@
<root url="file://$MODULE_DIR$/web/WEB-INF" relative="/WEB-INF" />
</webroots>
</component>
- <component name="WeblogicWebModuleProperties" />
</module>
Modified: trunk/stripes/stripes.iml
===================================================================
--- trunk/stripes/stripes.iml 2008-02-05 17:53:25 UTC (rev 839)
+++ trunk/stripes/stripes.iml 2008-02-06 02:38:02 UTC (rev 840)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
- <component name="ModuleRootManager" />
+<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/classes" />
<exclude-output />
@@ -33,20 +32,20 @@
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/test/log4j-1.2.9.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/build/jsp-api.jar!/" />
</CLASSES>
- <JAVADOC />
+ <JAVADOC>
+ <root url="http://java.sun.com/j2ee/1.4/docs/api/"; />
+ </JAVADOC>
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/build/jsp-api.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/build/el-api.jar!/" />
</CLASSES>
- <JAVADOC>
- <root url="http://java.sun.com/j2ee/1.4/docs/api/"; />
- </JAVADOC>
+ <JAVADOC />
<SOURCES />
</library>
</orderEntry>
@@ -86,6 +85,15 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library" exported="">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/test/log4j-1.2.15.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
<javadoc-paths>
<root url="file://$MODULE_DIR$/docs" />
Modified: trunk/stripes.ipr
===================================================================
--- trunk/stripes.ipr 2008-02-05 17:53:25 UTC (rev 839)
+++ trunk/stripes.ipr 2008-02-06 02:38:02 UTC (rev 840)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project version="4" relativePaths="true">
+<project relativePaths="true" version="4">
<component name="AntConfiguration">
<defaultAnt bundledAnt="true" />
</component>
@@ -96,6 +96,15 @@
<option name="HTML_ALIGN_TEXT" value="true" />
<option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
<option name="HTML_DO_NOT_INDENT_CHILDREN_OF" value="" />
+ <ADDITIONAL_INDENT_OPTIONS fileType="js">
+ <option name="INDENT_SIZE" value="4" />
+ <option name="CONTINUATION_INDENT_SIZE" value="8" />
+ <option name="TAB_SIZE" value="4" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ </ADDITIONAL_INDENT_OPTIONS>
</value>
</option>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
@@ -119,11 +128,12 @@
<entry name="?*.tld" />
</wildcardResourcePatterns>
</component>
- <component name="DataSourceManagerImpl" />
<component name="DependenciesAnalyzeManager">
<option name="myForwardDirection" value="false" />
</component>
- <component name="DependencyValidationManager" />
+ <component name="DependencyValidationManager">
+ <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+ </component>
<component name="EclipseCompilerSettings">
<option name="DEBUGGING_INFO" value="true" />
<option name="GENERATE_NO_WARNINGS" value="true" />
@@ -139,14 +149,13 @@
<option name="MAXIMUM_HEAP_SIZE" value="128" />
</component>
<component name="EntryPointsManager">
- <entry_points />
+ <entry_points version="2.0" />
</component>
<component name="ExportToHTMLSettings">
<option name="PRINT_LINE_NUMBERS" value="false" />
<option name="OPEN_IN_BROWSER" value="false" />
<option name="OUTPUT_DIRECTORY" />
</component>
- <component name="GUI Designer component loader factory" />
<component name="IdProvider" IDEtalkID="6C3C9BA2991A23FB866DFDD9B2AEFB67" />
<component name="InspectionProjectProfileManager">
<option name="PROJECT_PROFILE" value="Stripes" />
@@ -156,24 +165,6 @@
<profile version="1.0" is_locked="false">
<option name="myName" value="Stripes" />
<option name="myLocal" value="false" />
- <used_levels>
- <error>
- <option name="myName" value="ERROR" />
- <option name="myVal" value="300" />
- </error>
- <warning>
- <option name="myName" value="WARNING" />
- <option name="myVal" value="200" />
- </warning>
- <information>
- <option name="myName" value="INFO" />
- <option name="myVal" value="100" />
- </information>
- <server>
- <option name="myName" value="SERVER PROBLEM" />
- <option name="myVal" value="100" />
- </server>
- </used_levels>
<inspection_tool class="ClassReferencesSubclass" level="WARNING"
enabled="true" />
<inspection_tool class="DeclareCollectionAsInterface" level="WARNING"
enabled="true">
<option name="ignoreLocalVariables" value="true" />
@@ -206,7 +197,9 @@
<inspection_tool class="ClassInitializer" level="WARNING"
enabled="true" />
<inspection_tool class="ThrowablePrintStackTrace" level="WARNING"
enabled="true" />
<inspection_tool class="ThreadDumpStack" level="WARNING"
enabled="true" />
- <inspection_tool class="ObsoleteCollection" level="WARNING"
enabled="true" />
+ <inspection_tool class="ObsoleteCollection" level="WARNING"
enabled="true">
+ <option name="ignoreLibraryArguments" value="false" />
+ </inspection_tool>
<inspection_tool class="SystemOutErr" level="WARNING" enabled="true" />
<inspection_tool class="CStyleArrayDeclaration" level="WARNING"
enabled="true" />
<inspection_tool class="RedundantFieldInitialization" level="WARNING"
enabled="true" />
@@ -227,7 +220,9 @@
<inspection_tool class="FallthruInSwitchStatement" level="WARNING"
enabled="true" />
<inspection_tool class="IfStatementWithIdenticalBranches"
level="WARNING" enabled="true" />
<inspection_tool class="LabeledStatement" level="WARNING"
enabled="true" />
- <inspection_tool class="LoopConditionNotUpdatedInsideLoop"
level="WARNING" enabled="true" />
+ <inspection_tool class="LoopConditionNotUpdatedInsideLoop"
level="WARNING" enabled="true">
+ <option name="ignoreIterators" value="false" />
+ </inspection_tool>
<inspection_tool class="NestedConditionalExpression" level="WARNING"
enabled="true" />
<inspection_tool class="UseOfAnotherObjectsPrivateField"
level="WARNING" enabled="true" />
<inspection_tool class="AssignmentToCollectionFieldFromParameter"
level="WARNING" enabled="true">
@@ -241,10 +236,13 @@
<inspection_tool class="ThrowCaughtLocally" level="WARNING"
enabled="true">
<option name="ignoreRethrownExceptions" value="false" />
</inspection_tool>
- <inspection_tool class="ExceptionFromCatchWhichDoesntWrap"
level="WARNING" enabled="true" />
+ <inspection_tool class="ExceptionFromCatchWhichDoesntWrap"
level="WARNING" enabled="true">
+ <option name="ignoreGetMessage" value="false" />
+ </inspection_tool>
<inspection_tool class="UnusedCatchParameter" level="WARNING"
enabled="true">
<option name="m_ignoreCatchBlocksWithComments" value="true" />
<option name="m_ignoreTestCases" value="false" />
+ <option name="m_ignoreIgnoreParameter" value="true" />
</inspection_tool>
<inspection_tool class="JavaDoc" level="INFO" enabled="true">
<option name="TOP_LEVEL_CLASS_OPTIONS">
@@ -292,6 +290,7 @@
</inspection_tool>
<inspection_tool class="DuplicateStringLiteralInspection"
level="WARNING" enabled="true">
<option name="MIN_STRING_LENGTH" value="5" />
+ <option name="IGNORE_PROPERTY_KEYS" value="false" />
</inspection_tool>
<inspection_tool class="SimpleDateFormatWithoutLocale" level="WARNING"
enabled="true" />
<inspection_tool class="MagicCharacter" level="WARNING" enabled="true"
/>
@@ -305,9 +304,8 @@
</inspection_tool>
<inspection_tool class="SystemGC" level="WARNING" enabled="true" />
<inspection_tool class="BooleanMethodNameMustStartWithQuestion"
level="WARNING" enabled="true">
- <option name="nameCheckString"
value="is,can,has,should,could,will,shall,check,contains,equals,add,put,remove,startsWith,endsWith"
/>
+ <option name="questionString"
value="is,can,has,should,could,will,shall,check,contains,equals,add,put,remove,startsWith,endsWith"
/>
</inspection_tool>
- <inspection_tool class="ClassNamePrefixedWithPackageName"
level="WARNING" enabled="true" />
<inspection_tool class="ClassNameSameAsAncestorName" level="WARNING"
enabled="true" />
<inspection_tool class="ExceptionNameDoesntEndWithException"
level="WARNING" enabled="true" />
<inspection_tool class="AnnotationNamingConvention" level="WARNING"
enabled="true">
@@ -384,7 +382,9 @@
<inspection_tool class="MapReplaceableByEnumMap" level="WARNING"
enabled="true" />
<inspection_tool class="SetReplaceableByEnumSet" level="WARNING"
enabled="true" />
<inspection_tool class="LengthOneStringInIndexOf" level="WARNING"
enabled="true" />
- <inspection_tool class="SizeReplaceableByIsEmpty" level="WARNING"
enabled="true" />
+ <inspection_tool class="SizeReplaceableByIsEmpty" level="WARNING"
enabled="true">
+ <option name="ignoreNegations" value="false" />
+ </inspection_tool>
<inspection_tool class="StringConcatenationInLoops" level="WARNING"
enabled="true">
<option name="m_ignoreUnlessAssigned" value="true" />
</inspection_tool>
@@ -393,10 +393,7 @@
<inspection_tool class="ObjectToString" level="WARNING" enabled="true"
/>
<inspection_tool class="CastConflictsWithInstanceof" level="WARNING"
enabled="true" />
<inspection_tool class="CollectionAddedToSelf" level="WARNING"
enabled="true" />
- <inspection_tool class="ArrayEquals" level="WARNING" enabled="true" />
- <inspection_tool class="EqualsWhichDoesntCheckParameterClass"
level="WARNING" enabled="true" />
<inspection_tool class="MalformedXPath" level="WARNING"
enabled="false" />
- <inspection_tool class="FacesModelInspection" level="ERROR"
enabled="false" />
<inspection_tool class="NonJREEmulationClassesInClientCode"
level="ERROR" enabled="false" />
<inspection_tool class="GwtServiceNotRegistered" level="ERROR"
enabled="false" />
<inspection_tool class="GWTRemoteServiceAsyncCheck" level="ERROR"
enabled="false" />
@@ -409,6 +406,9 @@
<option name="REPORT_NOT_ANNOTATED_METHOD_OVERRIDES_NOTNULL"
value="true" />
<option name="REPORT_NOTNULL_PARAMETER_OVERRIDES_NULLABLE"
value="true" />
<option name="REPORT_NOT_ANNOTATED_PARAMETER_OVERRIDES_NOTNULL"
value="true" />
+ <option name="REPORT_NOT_ANNOTATED_GETTER" value="true" />
+ <option name="REPORT_NOT_ANNOTATED_SETTER_PARAMETER" value="true" />
+ <option name="REPORT_ANNOTATION_NOT_PROPAGATED_TO_OVERRIDERS"
value="true" />
</inspection_tool>
<inspection_tool class="ObjectEquality" level="WARNING" enabled="true">
<option name="m_ignoreEnums" value="true" />
@@ -436,7 +436,9 @@
<inspection_tool class="ThreadStartInConstruction" level="WARNING"
enabled="true" />
<inspection_tool class="ThreadStopSuspendResume" level="WARNING"
enabled="true" />
<inspection_tool class="ThreadYield" level="WARNING" enabled="true" />
- <inspection_tool class="DoubleCheckedLocking" level="WARNING"
enabled="true" />
+ <inspection_tool class="DoubleCheckedLocking" level="WARNING"
enabled="true">
+ <option name="ignoreOnVolatileVariables" value="false" />
+ </inspection_tool>
<inspection_tool class="FieldAccessedSynchronizedAndUnsynchronized"
level="WARNING" enabled="true">
<option name="countGettersAndSetters" value="false" />
</inspection_tool>
@@ -448,8 +450,23 @@
<inspection_tool class="NoLabelFor" level="WARNING" enabled="false" />
<inspection_tool class="NoButtonGroup" level="WARNING" enabled="false"
/>
<inspection_tool class="NoScrollPane" level="WARNING" enabled="false"
/>
+ <inspection_tool class="groupsTestNG" level="WARNING" enabled="true">
+ <option name="groups">
+ <value>
+ <list size="1">
+ <item index="0" class="java.lang.String" itemvalue="fast" />
+ </list>
+ </value>
+ </option>
+ </inspection_tool>
</profile>
</profiles>
+ <list size="4">
+ <item index="0" class="java.lang.String" itemvalue="SERVER PROBLEM" />
+ <item index="1" class="java.lang.String" itemvalue="INFO" />
+ <item index="2" class="java.lang.String" itemvalue="WARNING" />
+ <item index="3" class="java.lang.String" itemvalue="ERROR" />
+ </list>
</component>
<component name="JavacSettings">
<option name="DEBUGGING_INFO" value="true" />
@@ -610,16 +627,22 @@
</item>
</group>
</component>
+ <component name="ProjectFileVersion" converted="true" />
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/examples/Examples.iml"
filepath="$PROJECT_DIR$/examples/Examples.iml" />
- <module fileurl="file://$PROJECT_DIR$/Test/Test.iml"
filepath="$PROJECT_DIR$/Test/Test.iml" />
<module fileurl="file://$PROJECT_DIR$/stripes/stripes.iml"
filepath="$PROJECT_DIR$/stripes/stripes.iml" />
<module fileurl="file://$PROJECT_DIR$/tests/tests.iml"
filepath="$PROJECT_DIR$/tests/tests.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" assert-keyword="true"
jdk-15="true" project-jdk-name="1.5" />
- <component name="ProjectRunConfigurationManager" />
+ <component name="ResourceManagerContainer">
+ <option name="myResourceBundles">
+ <value>
+ <list size="0" />
+ </value>
+ </option>
+ </component>
<component name="RmicSettings">
<option name="IS_EANABLED" value="false" />
<option name="DEBUGGING_INFO" value="true" />
@@ -627,9 +650,10 @@
<option name="GENERATE_IIOP_STUBS" value="false" />
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
</component>
- <component name="StarteamVcsAdapter" />
- <component name="StrutspluginConfiguration" />
- <component name="VssVcs" />
+ <component name="VcsDirectoryMappings">
+ <mapping directory="" vcs="svn" />
+ </component>
+ <component name="WebServicesPlugin" addRequiredLibraries="true" />
<component name="com.intellij.jsf.UserDefinedFacesConfigs">
<option name="USER_DEFINED_CONFIGS">
<value>
@@ -637,12 +661,5 @@
</value>
</option>
</component>
- <component name="libraryTable" />
- <component name="uidesigner-configuration">
- <option name="INSTRUMENT_CLASSES" value="true" />
- <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" />
- <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" />
- </component>
- <UsedPathMacros />
</project>
Modified: trunk/tests/tests.iml
===================================================================
--- trunk/tests/tests.iml 2008-02-05 17:53:25 UTC (rev 839)
+++ trunk/tests/tests.iml 2008-02-06 02:38:02 UTC (rev 840)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
- <component name="ModuleRootManager" />
+<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/classes" />
<exclude-output />
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
