Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1 → Rev 9

/impl/local.properties
File deleted
/impl/estgweb.iml
10,6 → 10,8
<sourceFolder url="file://$MODULE_DIR$/conf/language" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/gen/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/build" />
<excludeFolder url="file://$MODULE_DIR$/dist" />
</content>
<orderEntry type="jdk" jdkName="1.5" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
/impl/estgweb.iws
16,7 → 16,30
<option name="USER" value="" />
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="" />
<list default="true" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/dao/impl/SessionObjectIdDao.java" afterPath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/dao/impl/SessionObjectIdDao.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/CourseUserAssociation.java" afterPath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/CourseUserAssociation.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUserAssociationDao.java" afterPath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseUserAssociationDao.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/Image.java" afterPath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/Image.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/dao/impl/ImageDao.java" afterPath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/dao/impl/ImageDao.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/dao/impl/UserSessionDao.java" afterPath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/dao/impl/UserSessionDao.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/SessionObjectId.java" afterPath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/SessionObjectId.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/dao/impl/GenericUserDao.java" afterPath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/dao/impl/GenericUserDao.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/estgweb.iws" afterPath="$PROJECT_DIR$/estgweb.iws" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/Announcement.java" afterPath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/Announcement.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/UserSession.java" afterPath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/UserSession.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/dao/impl/SessionObjectDao.java" afterPath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/dao/impl/SessionObjectDao.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/dao/impl/AnnouncementDao.java" afterPath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/dao/impl/AnnouncementDao.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/GenericUser.java" afterPath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/GenericUser.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/Course.java" afterPath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/Course.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/Group.java" afterPath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/Group.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/dao/impl/GroupDao.java" afterPath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/dao/impl/GroupDao.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/User.java" afterPath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/User.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.xml" afterPath="$PROJECT_DIR$/build.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/dao/impl/UserDao.java" afterPath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/dao/impl/UserDao.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/SessionObject.java" afterPath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/SessionObject.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseDao.java" afterPath="$PROJECT_DIR$/gen/java/pt/estgp/estgweb/domain/dao/impl/CourseDao.java" />
</list>
</component>
<component name="ChangeListSynchronizer" />
<component name="ChangesViewManager" flattened_view="true" />
146,46 → 169,37
<component name="FavoritesProjectViewPane" />
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="announcements.jsp" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/web/public/announcements/announcements.jsp">
<file leaf-file-name="siteLayout.jsp" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/web/layout/siteLayout.jsp">
<provider selected="true" editor-type-id="text-editor">
<state line="25" column="71" selection-start="1164" selection-end="1164" vertical-scroll-proportion="1.1740332">
<state line="5" column="58" selection-start="324" selection-end="324" vertical-scroll-proportion="0.15682657">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="header.jsp" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/web/layout/header.jsp">
<file leaf-file-name="layout1.jsp" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/web/layout/layout1.jsp">
<provider selected="true" editor-type-id="text-editor">
<state line="35" column="127" selection-start="1493" selection-end="1493" vertical-scroll-proportion="0.66574585">
<state line="12" column="103" selection-start="633" selection-end="727" vertical-scroll-proportion="0.38709676">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="style.css" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/web/css/style.css">
<file leaf-file-name="navigationLeft.jsp" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/web/layout/navigationLeft.jsp">
<provider selected="true" editor-type-id="text-editor">
<state line="164" column="57" selection-start="2349" selection-end="2349" vertical-scroll-proportion="1.0371352">
<state line="19" column="38" selection-start="740" selection-end="740" vertical-scroll-proportion="0.21033211">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="layout1.jsp" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/web/layout/layout1.jsp">
<provider selected="true" editor-type-id="text-editor">
<state line="15" column="8" selection-start="802" selection-end="844" vertical-scroll-proportion="0.7044199">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="tiles-default.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/conf/WEB-INF/struts/tiles-default.xml">
<provider selected="true" editor-type-id="text-editor">
<state line="66" column="4" selection-start="2958" selection-end="2958" vertical-scroll-proportion="1.8806366">
<state line="66" column="4" selection-start="2958" selection-end="2958" vertical-scroll-proportion="0.031365313">
<folding />
</state>
</provider>
194,7 → 208,7
<file leaf-file-name="navigationMenu.jsp" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/web/layout/navigationMenu.jsp">
<provider selected="true" editor-type-id="text-editor">
<state line="16" column="28" selection-start="600" selection-end="600" vertical-scroll-proportion="0.4509284">
<state line="16" column="28" selection-start="600" selection-end="600" vertical-scroll-proportion="0.501845">
<folding />
</state>
</provider>
203,16 → 217,34
<file leaf-file-name="layout2.jsp" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/web/layout/layout2.jsp">
<provider selected="true" editor-type-id="text-editor">
<state line="15" column="50" selection-start="809" selection-end="809" vertical-scroll-proportion="0.67639256">
<state line="15" column="31" selection-start="790" selection-end="790" vertical-scroll-proportion="0.4704797">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="build.xml" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/build.xml">
<provider selected="true" editor-type-id="text-editor">
<state line="376" column="50" selection-start="17033" selection-end="17033" vertical-scroll-proportion="2.8083491">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="local.properties" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/local.properties">
<provider selected="true" editor-type-id="text-editor">
<state line="8" column="0" selection-start="160" selection-end="160" vertical-scroll-proportion="0.2509225">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="layout3.jsp" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/web/layout/layout3.jsp">
<provider selected="true" editor-type-id="text-editor">
<state line="15" column="50" selection-start="809" selection-end="809" vertical-scroll-proportion="0.67639256">
<state line="15" column="50" selection-start="809" selection-end="809" vertical-scroll-proportion="0.4704797">
<folding />
</state>
</provider>
221,7 → 253,7
<file leaf-file-name="layout4.jsp" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/web/layout/layout4.jsp">
<provider selected="true" editor-type-id="text-editor">
<state line="15" column="50" selection-start="809" selection-end="809" vertical-scroll-proportion="0.67639256">
<state line="12" column="24" selection-start="613" selection-end="613" vertical-scroll-proportion="0.37638375">
<folding />
</state>
</provider>
334,46 → 366,10
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:C:\Servidores\worspace\estgweb\impl" />
<option name="myItemId" value="PsiDirectory:C:\Servidores\workspace\estgweb\impl" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="estgweb.ipr" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="estgweb" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:C:\Servidores\worspace\estgweb\impl" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:C:\Servidores\worspace\estgweb\impl\src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="estgweb.ipr" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="estgweb" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:C:\Servidores\worspace\estgweb\impl" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:C:\Servidores\worspace\estgweb\impl\conf" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</component>
<component name="ProjectReloadState">
427,7 → 423,123
<recent name="pt.estgp.estgweb.filters.filters" />
</key>
</component>
<component name="RestoreUpdateTree" />
<component name="RestoreUpdateTree">
<UpdateInfo date="13-03-2008 19:52" ActionInfo="_Update">
<UpdatedFiles>
<FILE-GROUP>
<option name="myUpdateName" value="Updated from server" />
<option name="myStatusName" value="Changed on server" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="CHANGED_ON_SERVER" />
<FILE-GROUP>
<option name="myUpdateName" value="Updated" />
<option name="myStatusName" value="Changed" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="UPDATED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Created" />
<option name="myStatusName" value="Created" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="CREATED" />
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp\estgweb</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\Course.java</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\Image.java</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\UserSession.java</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\dao</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\dao\impl</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\dao\impl\GenericUserDao.java</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\dao\impl\CourseUserAssociationDao.java</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\dao\impl\GroupDao.java</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\dao\impl\UserDao.java</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\dao\impl\CourseDao.java</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\dao\impl\ImageDao.java</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\dao\impl\UserSessionDao.java</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\dao\impl\SessionObjectIdDao.java</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\dao\impl\AnnouncementDao.java</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\dao\impl\SessionObjectDao.java</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\SessionObjectId.java</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\Announcement.java</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\SessionObject.java</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\GenericUser.java</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\CourseUserAssociation.java</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\Group.java</PATH>
<PATH>C:\Servidores\workspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\User.java</PATH>
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Deleted" />
<option name="myStatusName" value="Deleted" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="true" />
<option name="myId" value="REMOVED_FROM_REPOSITORY" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Restored" />
<option name="myStatusName" value="Will be restored" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="RESTORED" />
</FILE-GROUP>
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Modified" />
<option name="myStatusName" value="Modified" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MODIFIED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Skipped" />
<option name="myStatusName" value="Skipped" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="SKIPPED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Merged with conflicts" />
<option name="myStatusName" value="Will be merged with conflicts" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MERGED_WITH_CONFLICTS" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Merged" />
<option name="myStatusName" value="Will be merged" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MERGED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Not in repository" />
<option name="myStatusName" value="Not in repository" />
<option name="mySupportsDeletion" value="true" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="UNKNOWN" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Locally added" />
<option name="myStatusName" value="Locally added" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="LOCALLY_ADDED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Locally removed" />
<option name="myStatusName" value="Locally removed" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="LOCALLY_REMOVED" />
</FILE-GROUP>
</UpdatedFiles>
</UpdateInfo>
</component>
<component name="RunManager" selected="Application.Test">
<tempConfiguration default="false" name="Test" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" value="Test" />
450,18 → 562,6
<option name="Make" value="false" />
</method>
</tempConfiguration>
<configuration default="true" type="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
<option name="HTML_FILE_NAME" />
<option name="HTML_USED" value="false" />
<option name="WIDTH" value="400" />
<option name="HEIGHT" value="300" />
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
<option name="VM_PARAMETERS" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
<configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Remote">
<option name="WORKING_DIRECTORY" />
<option name="HOST" value="localhost" />
474,18 → 574,17
<option name="BASE_DIRECTORY_NAME" value="" />
<predefined_log_file id="TOMCAT_LOCALHOST_LOG_ID" enabled="true" />
</configuration>
<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<configuration default="true" type="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
<option name="HTML_FILE_NAME" />
<option name="HTML_USED" value="false" />
<option name="WIDTH" value="400" />
<option name="HEIGHT" value="300" />
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<module name="" />
<method>
<option name="Make" value="false" />
</method>
</configuration>
<configuration default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
513,6 → 612,19
<option name="Make" value="true" />
</method>
</configuration>
<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<module name="" />
<method>
<option name="Make" value="false" />
</method>
</configuration>
<configuration default="false" name="ReflectionBean" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" value="pt.estgp.estgweb.utils.ReflectionBean" />
<option name="VM_PARAMETERS" value="" />
641,9 → 753,10
<option name="UPDATE_RUN_STATUS" value="false" />
<option name="UPDATE_RECURSIVELY" value="true" />
<option name="MERGE_DRY_RUN" value="false" />
<configuration useDefault="true">C:\Documents and Settings\Fabio Velez\Application Data\Subversion</configuration>
<configuration useDefault="true">C:\Documents and Settings\User\Application Data\Subversion</configuration>
<checkoutURL>http://deptal.estgp.pt:9090/svn/estgweb</checkoutURL>
<checkoutURL>svn://deptal.estgp.pt</checkoutURL>
<upgradeMode>auto</upgradeMode>
</component>
<component name="TodoView" selected-index="0">
<todo-panel id="selected-file">
660,24 → 773,23
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-4" y="-4" width="1288" height="774" extended-state="6" />
<frame x="-4" y="-4" width="1288" height="998" extended-state="6" />
<editor active="false" />
<layout>
<window_info id="SVN Repositories" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32972136" order="8" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972136" order="7" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32873562" order="7" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24471545" order="0" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32662538" order="1" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24878049" order="1" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3126935" order="8" />
<window_info id="Messages" active="true" anchor="bottom" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.31264368" order="8" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.18211383" order="1" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32988507" order="8" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.5" order="2" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
<window_info id="Struts Assistant" active="false" anchor="left" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32868853" order="3" />
685,7 → 797,8
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39628482" order="4" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.398374" order="0" />
<window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32988507" order="8" />
<window_info id="SVN Repositories" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32972136" order="8" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
<window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="3" />
706,7 → 819,7
<option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" />
<option name="PUT_FOCUS_INTO_COMMENT" value="false" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
<option name="LAST_COMMIT_MESSAGE" />
<option name="LAST_COMMIT_MESSAGE" value="" />
<option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
<option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
772,7 → 885,7
<component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="0.16666667" version="1">
<option name="myLastEditedConfigurable" value="Local Scopes" />
</component>
<component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.16666667" version="1">
<component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.16666667,0.5" version="1">
<option name="myPlainMode" value="false" />
<option name="myLastEditedConfigurable" value="estgweb" />
</component>
780,110 → 893,110
<option name="myLastEditedConfigurable" value="Default" />
</component>
<component name="editorHistoryManager">
<entry file="jar://C:/Servidores/worspace/estgweb/common/struts/struts.jar!/org/apache/struts/taglib/tiles/InsertTag.class">
<entry file="file://$PROJECT_DIR$/conf/WEB-INF/struts/struts-default.xml">
<provider editor-type-id="com.intellij.struts.diagram.DiagramEditorProvider">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state line="5" column="13" selection-start="168" selection-end="168" vertical-scroll-proportion="-0.23367697">
<state line="55" column="53" selection-start="1770" selection-end="1770" vertical-scroll-proportion="0.35906643">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/web/layout/footer.jsp">
<entry file="file://$PROJECT_DIR$/conf/WEB-INF/tlds/struts-html.tld">
<provider selected="true" editor-type-id="text-editor">
<state line="10" column="11" selection-start="414" selection-end="430" vertical-scroll-proportion="0.2847571">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/conf/WEB-INF/tlds/struts-tiles.tld">
<entry file="file://$PROJECT_DIR$/src/web/public/announcements/announcements.jsp">
<provider selected="true" editor-type-id="text-editor">
<state line="38" column="0" selection-start="873" selection-end="873" vertical-scroll-proportion="0.33333334">
<state line="25" column="71" selection-start="1164" selection-end="1164" vertical-scroll-proportion="0.4879725">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/web/layout/siteLayout.jsp">
<entry file="file://$PROJECT_DIR$/src/web/layout/header.jsp">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<state line="35" column="127" selection-start="1493" selection-end="1493" vertical-scroll-proportion="0.5657568">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/web/layout/navigationLeft.jsp">
<entry file="file://$PROJECT_DIR$/src/web/css/style.css">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<state line="24" column="15" selection-start="315" selection-end="315" vertical-scroll-proportion="0.031365313">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/conf/WEB-INF/struts/tiles-default.xml">
<entry file="file://$PROJECT_DIR$/src/web/layout/siteLayout.jsp">
<provider selected="true" editor-type-id="text-editor">
<state line="66" column="4" selection-start="2958" selection-end="2958" vertical-scroll-proportion="1.8806366">
<state line="5" column="58" selection-start="324" selection-end="324" vertical-scroll-proportion="0.15682657">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/conf/WEB-INF/struts/struts-default.xml">
<entry file="file://$PROJECT_DIR$/src/web/layout/layout1.jsp">
<provider selected="true" editor-type-id="text-editor">
<state line="55" column="53" selection-start="1770" selection-end="1770" vertical-scroll-proportion="0.35906643">
<state line="12" column="103" selection-start="633" selection-end="727" vertical-scroll-proportion="0.38709676">
<folding />
</state>
</provider>
<provider editor-type-id="com.intellij.struts.diagram.DiagramEditorProvider">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/conf/WEB-INF/tlds/struts-html.tld">
<entry file="file://$PROJECT_DIR$/src/web/layout/navigationLeft.jsp">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<state line="19" column="38" selection-start="740" selection-end="740" vertical-scroll-proportion="0.21033211">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/web/layout/navigationMenu.jsp">
<entry file="file://$PROJECT_DIR$/conf/WEB-INF/struts/tiles-default.xml">
<provider selected="true" editor-type-id="text-editor">
<state line="16" column="28" selection-start="600" selection-end="600" vertical-scroll-proportion="0.4509284">
<state line="66" column="4" selection-start="2958" selection-end="2958" vertical-scroll-proportion="0.031365313">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/web/layout/layout1.jsp">
<entry file="file://$PROJECT_DIR$/src/web/layout/layout3.jsp">
<provider selected="true" editor-type-id="text-editor">
<state line="15" column="8" selection-start="802" selection-end="844" vertical-scroll-proportion="0.7044199">
<state line="15" column="50" selection-start="809" selection-end="809" vertical-scroll-proportion="0.4704797">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/web/layout/layout2.jsp">
<entry file="file://$PROJECT_DIR$/src/web/layout/layout4.jsp">
<provider selected="true" editor-type-id="text-editor">
<state line="15" column="50" selection-start="809" selection-end="809" vertical-scroll-proportion="0.67639256">
<state line="12" column="24" selection-start="613" selection-end="613" vertical-scroll-proportion="0.37638375">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/web/layout/layout3.jsp">
<entry file="file://$PROJECT_DIR$/src/web/layout/navigationMenu.jsp">
<provider selected="true" editor-type-id="text-editor">
<state line="15" column="50" selection-start="809" selection-end="809" vertical-scroll-proportion="0.67639256">
<state line="16" column="28" selection-start="600" selection-end="600" vertical-scroll-proportion="0.501845">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/web/layout/layout4.jsp">
<entry file="file://$PROJECT_DIR$/src/web/layout/layout2.jsp">
<provider selected="true" editor-type-id="text-editor">
<state line="15" column="50" selection-start="809" selection-end="809" vertical-scroll-proportion="0.67639256">
<state line="15" column="31" selection-start="790" selection-end="790" vertical-scroll-proportion="0.4704797">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/web/layout/header.jsp">
<entry file="file://$PROJECT_DIR$/local.properties">
<provider selected="true" editor-type-id="text-editor">
<state line="35" column="127" selection-start="1493" selection-end="1493" vertical-scroll-proportion="0.66574585">
<state line="8" column="0" selection-start="160" selection-end="160" vertical-scroll-proportion="0.2509225">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/web/css/style.css">
<entry file="file://$PROJECT_DIR$/build.xml">
<provider selected="true" editor-type-id="text-editor">
<state line="164" column="57" selection-start="2349" selection-end="2349" vertical-scroll-proportion="1.0371352">
<state line="376" column="50" selection-start="17033" selection-end="17033" vertical-scroll-proportion="2.8083491">
<folding />
</state>
</provider>
/impl/conf/berserk/fcd.xml
22,7 → 22,7
</filterChain>
<filterChain>
<name>Admins</name>
<expression>AuthenticatedUsers &amp;&amp; RoleUsers("student","admin","all")</expression>
<expression>AuthenticatedUsers &amp;&amp; RoleUsers("admin")</expression>
<description>Admins Control Chain</description>
<invocationTiming>1</invocationTiming>
<filterClass>pt.estgp.estgweb.filters.chains.AdminControlFilter</filterClass>
/impl/src/java/pt/estgp/estgweb/utils/RoleManager.java
26,6 → 26,8
 
public static boolean hasRole(User u, List requiredRoles)
{
if(u == null)
return false;
for(Object role: requiredRoles)
{
if(hasRole(u,(String) role))
35,6 → 37,8
}
public static boolean hasRole(User u, String requiredRole)
{
if(u == null)
return false;
if(u.getRoles() == null || u.getRoles().length() == 0)
return false;
 
/impl/src/java/pt/estgp/estgweb/Globals.java
2,6 → 2,8
 
import pt.estgp.estgweb.utils.ConfigProperties;
 
import java.util.List;
 
/**
* @author Jorge Machado
* @date 28/Fev/2008
13,4 → 15,5
public static final String ADMIN_ROLE = ConfigProperties.getProperty("user.admin");
public static final String SUPER_USER_ROLE = ConfigProperties.getProperty("user.super");
public static final String USER_SESSION_KEY = "USER_SESSION_KEY";
public static final List<String> AUTOMATIC_VALIDATION_ROLES = ConfigProperties.getListValues("announcements.automatic.validation.role");
}
/impl/src/java/pt/estgp/estgweb/services/announcements/CreateAnnouncementService.java
6,8 → 6,11
import pt.estgp.estgweb.domain.views.AnnouncementView;
import pt.estgp.estgweb.domain.dao.DaoFactory;
import pt.estgp.estgweb.utils.ConfigProperties;
import pt.estgp.estgweb.utils.RoleManager;
import pt.estgp.estgweb.Globals;
 
import java.util.Date;
import java.util.List;
 
import org.apache.log4j.Logger;
 
38,6 → 41,12
announcement.setTargetRoles(ALL_ROLE);
announcement.setOwner(userSession.getUser());
announcement.setSaveDate(new Date());
 
//Se for de validacao automatica ha de aparecer a combobox na web page e o user é que escolhe
//se não pomos false
if(!RoleManager.hasRole(userSession.getUser(),Globals.AUTOMATIC_VALIDATION_ROLES))
announcement.setStatus(false);
 
DaoFactory.getAnnouncementDaoImpl().save(announcement);
logger.info("Creating announcement:" + announcement.getId());
return new AnnouncementView(announcement);
/impl/src/java/pt/estgp/estgweb/services/announcements/EditAnnouncementService.java
2,10 → 2,12
 
import pt.utl.ist.berserk.logic.serviceManager.IService;
import pt.estgp.estgweb.utils.ConfigProperties;
import pt.estgp.estgweb.utils.RoleManager;
import pt.estgp.estgweb.domain.Announcement;
import pt.estgp.estgweb.domain.UserSession;
import pt.estgp.estgweb.domain.views.AnnouncementView;
import pt.estgp.estgweb.domain.dao.DaoFactory;
import pt.estgp.estgweb.Globals;
import org.apache.log4j.Logger;
 
/*
37,6 → 39,12
 
if(objectView.getTargetRoles() == null || objectView.getTargetRoles().size() == 0)
announcement.setTargetRoles(ALL_ROLE);
 
//Se for de validacao automatica ha de aparecer a combobox na web page e o user é que escolhe
//se não pomos false
if(!RoleManager.hasRole(userSession.getUser(), Globals.AUTOMATIC_VALIDATION_ROLES))
announcement.setStatus(false);
 
logger.info("Updating announcement:" + announcement.getId());
return new AnnouncementView(announcement);
}
/impl/src/java/pt/estgp/estgweb/services/authenticate/AuthenticateService.java
3,11 → 3,17
import org.apache.log4j.Logger;
import pt.estgp.estgweb.domain.User;
import pt.estgp.estgweb.domain.UserSession;
import pt.estgp.estgweb.domain.DomainObjectFactory;
import pt.estgp.estgweb.domain.UserImpl;
import pt.estgp.estgweb.domain.dao.DaoFactory;
import pt.estgp.estgweb.services.expceptions.ServiceException;
import pt.utl.ist.berserk.logic.serviceManager.IService;
import openldap.ILdapManager;
import openldap.LdapManagerFactory;
 
import java.util.HashMap;
 
 
/*
* @author Goncalo Luiz gedl [AT] rnl [DOT] ist [DOT] utl [DOT] pt
*
26,22 → 32,55
{
private static final Logger logger = Logger.getLogger(AuthenticateService.class);
 
public void run(String username, String password, UserSession userSession) throws ServiceException
ILdapManager ldapManager = LdapManagerFactory.getLdapManager();
 
public User run(String username, String password, UserSession userSession) throws ServiceException
{
if(userSession.getUser() != null)
throw new AuthenticateException(AuthenticateException.ALREADY_AUTHENTICATED);
 
User u = DaoFactory.getUserDaoImpl().loadByUsernameAndPassword(username,password);
boolean go = ldapManager.login(username,password);
 
User u = null;
if(!go)
{
u = DaoFactory.getUserDaoImpl().loadByUsernameAndPassword(username,password);
if(u == null)
{
logger.warn("user:" + username + " fail password");
throw new AuthenticateException(AuthenticateException.FAIL_AUTHENTICATION);
}
logger.warn("user:" + username + " fail LDAP but pass local authentication");
}
else
try
{
u = DaoFactory.getUserDaoImpl().loadByUsername(username);
}
catch(Throwable e){/*dont exist*/}
 
if(u == null)
{
logger.warn("user:" + username + " fail password");
throw new AuthenticateException(AuthenticateException.FAIL_AUTHENTICATION);
u = getUserInfo(username);
}
logger.warn("user:" + username + " authenticated");
userSession.setName(u.getName());
userSession.setUsername(u.getUsername());
userSession.setUser(u);
DaoFactory.getUserSessionDaoImpl().reattach(userSession);
return u;
}
 
//todo completar isto
private User getUserInfo(String username)
{
HashMap map = ldapManager.getUserInfo(username);
UserImpl u = DomainObjectFactory.createUserImpl();
u.setUsername(username);
u.setEmail((String) map.get("email"));
u.setName((String) map.get("name")); //isto esta mal e so para exemplificar depois tem de se ver isto bem
u.setNewUser(true);
DaoFactory.getUserDaoImpl().save(u);
return u;
}
}
/impl/src/java/pt/estgp/estgweb/domain/UserImpl.java
15,6 → 15,17
public class UserImpl extends User
{
 
private boolean newUser = false;
 
 
public boolean isNewUser() {
return newUser;
}
 
public void setNewUser(boolean newUser) {
this.newUser = newUser;
}
 
/**
* check if user is in some group
* @param g to check
/impl/src/web/css/style.css
19,6 → 19,13
FONT-SIZE:1em;
}
 
 
#body
{
width:950px;
}
 
 
th
{
 
139,8 → 146,6
MARGIN: 0;
PADDING-TOP: 0
}
 
 
TD#title
{
PADDING-LEFT: 0.5em;
/impl/src/web/layout/layout4.jsp
11,27 → 11,29
<jsp:include page="/layout/scripts.jsp"/>
</head>
<body class="small" marginwidth="0" marginheight="0" bgcolor="#ffffff" topmargin="0" leftmargin="0">
<div id="header">
<tiles:insert attribute="header"/>
<tiles:insert attribute="navigationMenu"/>
<div id="body">
<div id="header">
<tiles:insert attribute="header"/>
<tiles:insert attribute="navigationMenu"/>
</div>
<table id="bigtable">
<tr>
<td id="latnav_containerLeft">
<tiles:insert attribute="navigationLeft" />
</td>
<td id="content">
<tiles:insert attribute="topnav"/>
<tiles:insert attribute="body" />
</td>
<td id="latnav_containerRight">
<tiles:insert attribute="navigationRight"/>
</td>
</tr>
</table>
<div id="footer">
<tiles:insert attribute="footer"/>
</div>
</div>
<table id="bigtable">
<tr>
<td id="latnav_containerLeft">
<tiles:insert attribute="navigationLeft" />
</td>
<td id="content">
<tiles:insert attribute="topnav"/>
<tiles:insert attribute="body" />
</td>
<td id="latnav_containerRight">
<tiles:insert attribute="navigationRight"/>
</td>
</tr>
</table>
<div id="footer">
<tiles:insert attribute="footer"/>
</div>
</body>
</html:html>
 
/impl/build.xml
74,7 → 74,11
<target name="clean" description="clean *.class and build dir">
<delete dir="${build.dir}"/>
<delete dir="${dist.dir}"/>
<delete dir="${gen.dir.java}"/>
<delete>
<fileset dir="${gen.dir.java}">
<include name="**/*.java"/>
</fileset>
</delete>
<antcall target="initDirs"/>
</target>
 
202,7 → 206,7
</replace>
</target>
 
<target name="copy.jsps.war" depends="" description="copy only jsps to war distribution">
<target name="copy.jsps.war" description="copy only jsps to war distribution">
<copy todir="${build.dir.war}" overwrite="false">
<fileset dir="src/web">
<include name="**/*"/>
332,18 → 336,20
<antcall target="replaceFiltersConfigurationFiles"/>
</target>
<target name="dbInit">
<!--<delete file="${build.dir.classes}/${hibernate.cfg.xml.filename}"/>-->
<java classname="pt.estgp.estgweb.examples.DBInit" classpath="${build.dir.classes}" classpathref="pathToToolsLib"/>
<antcall target="replaceFiltersConfigurationFiles"/>
</target>
<!--<delete file="${build.dir.classes}/${hibernate.cfg.xml.filename}"/>-->
<java classname="pt.estgp.estgweb.examples.DBInit" classpath="${build.dir.classes}" classpathref="pathToToolsLib"/>
 
<antcall target="replaceFiltersConfigurationFiles"/>
</target>
 
 
 
<!--
Hibernate Tools Task
-->
<taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="pathToToolsLib" classpath="${build.dir.classes}"/>
<taskdef name="hibernatetool"
classname="org.hibernate.tool.ant.HibernateToolTask"
classpathref="pathToToolsLib" classpath="${build.dir.classes}"/>
<!--
==========================================================================================
GENERATE SQL SCRIPTS