Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1 → Rev 11

/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,15
<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$/conf/language/MessageResources.properties" afterPath="$PROJECT_DIR$/conf/language/MessageResources.properties" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/web/layout/navigationLeftMenu.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/estgweb.iws" afterPath="$PROJECT_DIR$/estgweb.iws" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/web/public/index.jsp" afterPath="$PROJECT_DIR$/src/web/public/index.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/web/layout/navigationRight.jsp" afterPath="$PROJECT_DIR$/src/web/layout/navigationRight.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/web/css/style.css" afterPath="$PROJECT_DIR$/src/web/css/style.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/web/layout/navigationLeft.jsp" afterPath="$PROJECT_DIR$/src/web/layout/navigationLeft.jsp" />
</list>
</component>
<component name="ChangeListSynchronizer" />
<component name="ChangesViewManager" flattened_view="true" />
143,90 → 151,63
<component name="FavoritesManager">
<favorites_list name="estgweb" />
</component>
<component name="FavoritesProjectViewPane" />
<component name="FavoritesProjectViewPane">
<subPane subId="estgweb">
<PATH>
<PATH_ELEMENT>
<option name="myItemId" />
<option name="myItemType" value="com.intellij.ide.favoritesTreeView.FavoritesTreeNodeDescriptor" />
</PATH_ELEMENT>
</PATH>
</subPane>
</component>
<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">
<provider selected="true" editor-type-id="text-editor">
<state line="25" column="71" selection-start="1164" selection-end="1164" vertical-scroll-proportion="1.1740332">
<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">
<provider selected="true" editor-type-id="text-editor">
<state line="35" column="127" selection-start="1493" selection-end="1493" vertical-scroll-proportion="0.66574585">
<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">
<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="321" column="19" selection-start="4788" selection-end="4788" vertical-scroll-proportion="0.29166666">
<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">
<file leaf-file-name="index.jsp" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/web/public/index.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="8" selection-start="494" selection-end="494" vertical-scroll-proportion="0.41463414">
<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">
<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="66" column="4" selection-start="2958" selection-end="2958" vertical-scroll-proportion="1.8806366">
<state line="12" column="55" selection-start="623" selection-end="623" vertical-scroll-proportion="0.34">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="navigationMenu.jsp" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/web/layout/navigationMenu.jsp">
<file leaf-file-name="navigationLeftMenu.jsp" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/web/layout/navigationLeftMenu.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="21" selection-start="610" selection-end="610" vertical-scroll-proportion="0.41951218">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="layout2.jsp" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/web/layout/layout2.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="15" column="50" selection-start="809" selection-end="809" vertical-scroll-proportion="0.67639256">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<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">
<folding />
</state>
</provider>
</entry>
</file>
<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">
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindManager">
338,42 → 319,6
<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">
387,7 → 332,7
<showLibraryContents />
<hideEmptyPackages />
<abbreviatePackageNames />
<showStructure ProjectPane="false" Scope="false" PackagesPane="false" />
<showStructure Favorites="false" ProjectPane="false" Scope="false" PackagesPane="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
427,7 → 372,132
<recent name="pt.estgp.estgweb.filters.filters" />
</key>
</component>
<component name="RestoreUpdateTree" />
<component name="RestoreUpdateTree">
<UpdateInfo date="14-03-2008 11:30" 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" />
<PATH>C:\Servidores\worspace\estgweb\impl\conf\berserk\fcd.xml</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\src\java\pt\estgp\estgweb\utils\RoleManager.java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\src\java\pt\estgp\estgweb\Globals.java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\src\java\pt\estgp\estgweb\services\announcements\CreateAnnouncementService.java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\src\java\pt\estgp\estgweb\services\announcements\EditAnnouncementService.java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\src\java\pt\estgp\estgweb\services\authenticate\AuthenticateService.java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\src\java\pt\estgp\estgweb\domain\UserImpl.java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\build.xml</PATH>
</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\worspace\estgweb\impl\gen</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt\estgp</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt\estgp\estgweb</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\Course.java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\Image.java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\UserSession.java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\dao</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\dao\impl</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\dao\impl\GenericUserDao.java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\dao\impl\CourseUserAssociationDao.java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\dao\impl\GroupDao.java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\dao\impl\UserDao.java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\dao\impl\CourseDao.java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\dao\impl\ImageDao.java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\dao\impl\UserSessionDao.java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\dao\impl\SessionObjectIdDao.java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\dao\impl\AnnouncementDao.java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\dao\impl\SessionObjectDao.java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\SessionObjectId.java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\Announcement.java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\SessionObject.java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\GenericUser.java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\CourseUserAssociation.java</PATH>
<PATH>C:\Servidores\worspace\estgweb\impl\gen\java\pt\estgp\estgweb\domain\Group.java</PATH>
<PATH>C:\Servidores\worspace\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,17 → 520,18
<option name="Make" value="false" />
</method>
</tempConfiguration>
<configuration default="true" type="Applet" factoryName="Applet">
<module name="" />
<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<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="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Remote">
<option name="WORKING_DIRECTORY" />
474,26 → 545,6
<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">
<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="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" value="javadebug" />
<option name="HOST" value="localhost" />
<option name="PORT" value="5005" />
</configuration>
<configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
513,6 → 564,25
<option name="Make" value="true" />
</method>
</configuration>
<configuration default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" value="javadebug" />
<option name="HOST" value="localhost" />
<option name="PORT" value="5005" />
</configuration>
<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="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="" />
644,6 → 714,7
<configuration useDefault="true">C:\Documents and Settings\Fabio Velez\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">
663,15 → 734,14
<frame x="-4" y="-4" width="1288" height="774" 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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24471545" order="0" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32520324" 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="false" anchor="bottom" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.1501548" 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" />
685,7 → 755,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.32972136" 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 → 777,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 → 843,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 → 851,107
<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$/src/web/index.jsp">
<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="2" column="0" selection-start="114" selection-end="114" vertical-scroll-proportion="0.055284552">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/web/layout/footer.jsp">
<entry file="file://$PROJECT_DIR$/src/web/layout/navigationRight.jsp">
<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="9" column="54" selection-start="483" selection-end="483" vertical-scroll-proportion="0.2562814">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/conf/WEB-INF/tlds/struts-tiles.tld">
<entry file="file://$PROJECT_DIR$/src/web/layout/layout2.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="5" column="0" selection-start="266" selection-end="330" vertical-scroll-proportion="0.12562814">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/web/layout/siteLayout.jsp">
<entry file="file://$PROJECT_DIR$/src/web/layout/layout4.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="18" column="51" selection-start="886" selection-end="886" vertical-scroll-proportion="0.43886098">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/web/layout/navigationLeft.jsp">
<entry file="file://$PROJECT_DIR$/conf/language/MessageResources.properties">
<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="83" column="36" selection-start="3726" selection-end="3726" vertical-scroll-proportion="-0.28522336">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/conf/WEB-INF/struts/tiles-default.xml">
<entry file="file://$PROJECT_DIR$/conf/language/MessageResourcesAnnouncements.properties">
<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="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/struts/struts-default.xml">
<entry file="file://$PROJECT_DIR$/conf/app.properties">
<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="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.76884425">
<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/navigationMenu.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="9" column="61" selection-start="351" selection-end="351" vertical-scroll-proportion="0.2562814">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/web/layout/navigationMenu.jsp">
<entry file="file://$PROJECT_DIR$/src/web/public/announcements/announcements.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="19" column="75" selection-start="1029" selection-end="1029" vertical-scroll-proportion="0.36833334">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/web/layout/layout1.jsp">
<entry file="file://$PROJECT_DIR$/src/web/public/index.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="8" selection-start="494" selection-end="494" vertical-scroll-proportion="0.41463414">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/web/layout/layout2.jsp">
<entry file="file://$PROJECT_DIR$/src/web/admin/announcements/submitAnnouncement.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="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/web/layout/layout3.jsp">
<entry file="file://$PROJECT_DIR$/src/web/layout/layout1.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="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/web/layout/layout4.jsp">
<entry file="file://$PROJECT_DIR$/src/web/layout/navigationLeftMenu.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="21" selection-start="610" selection-end="610" vertical-scroll-proportion="0.41951218">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/web/layout/header.jsp">
<entry file="file://$PROJECT_DIR$/src/web/layout/navigationLeft.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="55" selection-start="623" selection-end="623" vertical-scroll-proportion="0.34">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/web/css/style.css">
<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="321" column="19" selection-start="4788" selection-end="4788" vertical-scroll-proportion="0.29166666">
<folding />
</state>
</provider>
/impl/conf/language/MessageResources.properties
96,8 → 96,9
logout=Sair
submit.announcement=Colocar Anúncio
services=Serviços
announcements=Anúncios
announcements=Ultimas Notícias
courses=Cursos
mainAnnouncements=Destaques
 
 
#Mensagens Status
/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,15
FONT-SIZE:1em;
}
 
 
#body
{
width:950px;
margin-left: auto;
margin-right: auto;
}
 
 
th
{
 
26,7 → 35,8
 
A
{
COLOR: #793B0D
COLOR:#4D4D4D;
FONT-SIZE: 14px;
}
 
H1
130,7 → 140,62
{
FONT-SIZE: 13px
}
/***********Main Page******************/
TD #topBar
{
font-weight:bold;
color:white;
background-color:#8EC73F;
padding-left:25px;
}
 
TABLE #indexPage
{
width:100%;
}
/*************************************/
 
/**************** Navigation Left Menu**********/
#navigationLeftMenu LI A:link
{
COLOR:#4D4D4D;
PADDING-RIGHT: 0;
FONT-SIZE: 14px;
DISPLAY: block;
PADDING-LEFT: 10px;
PADDING-BOTTOM: 0;
PADDING-TOP: 0;
HEIGHT: 1%;
TEXT-DECORATION: none;
 
}
#navigationLeftMenu LI A:hover
{
COLOR:#8EC73F;
FONT-SIZE: 14px;
 
}
#navigationLeftMenu LI A:visited
{
PADDING-RIGHT: 0;
DISPLAY: block;
PADDING-LEFT: 10px;
PADDING-BOTTOM: 0;
PADDING-TOP: 0;
HEIGHT: 1%;
FONT-SIZE: 14px;
TEXT-DECORATION: none;
}
 
#navigationLeftMenu A
{
PADDING-LEFT: 5px ;
FONT-SIZE: 14px;
}
/************************************************/
 
 
 
FORM
{
PADDING-RIGHT: 0;
139,8 → 204,6
MARGIN: 0;
PADDING-TOP: 0
}
 
 
TD#title
{
PADDING-LEFT: 0.5em;
163,9 → 226,7
{
LEFT: 0;
WIDTH: 100%;
BORDER-BOTTOM: #E6731D 3px solid;
BACKGROUND-COLOR: white
 
}
#header #title
{
254,22 → 315,35
 
/* latnav */
 
TD#latnav_containerLeft,TD#latnav_containerRight
TD#latnav_containerLeft
{
BACKGROUND-COLOR: #F3B689;
BORDER-RIGHT-COLOR: #ccc;
BORDER-RIGHT: 1px solid;
VERTICAL-ALIGN: top;
WIDTH: 160px;
text-align:left;
}
#latnavLeft,#latnavRight
 
TD#latnav_containerRight{
VERTICAL-ALIGN: top;
WIDTH: 160px;
}
 
#latnavLeft
{
CLEAR: left;
LEFT: 0;
FLOAT: left;
PADDING-BOTTOM: 20px;
FONT: 11px/20px "bitstream vera sans", "Lucida Grande", "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif
PADDING-TOP: 30px;
}
 
#latnavRight
{
CLEAR: left;
LEFT: 0;
FLOAT: left;
PADDING-BOTTOM: 20px;
}
 
#latnavLeft P,#latnavRight P
{
FONT-SIZE: 12px;
281,20 → 355,34
MARGIN: 0;
WIDTH: 97%;
PADDING-TOP: 0;
BORDER-BOTTOM: 2px solid
BORDER-BOTTOM: 2 px solid;
}
 
#latnavLeft UL,#latnavRight UL
#latnavLeft UL
{
COLOR: black;
PADDING-RIGHT: 0;
PADDING-LEFT: 0;
MARGIN: 0;
WIDTH: 155px;
LINE-HEIGHT: 1.5em;
PADDING-TOP: 0;
LIST-STYLE-TYPE: none
 
}
 
#latnavRight UL
{
COLOR: black;
PADDING-RIGHT: 0;
PADDING-LEFT: 0;
PADDING-BOTTOM: 10px;
MARGIN: 0;
WIDTH: 155px;
LINE-HEIGHT: 1.5em;
PADDING-TOP: 0;
LIST-STYLE-TYPE: none
 
}
 
#latnavLeft LI,#latnavRight LI
306,38 → 394,41
MARGIN: 0;
PADDING-TOP: 0
}
#latnavLeft LI A:link,#latnavRight LI A:link
#latnavLeft LI A:link
{
BORDER-BOTTOM-COLOR: #003366;
COLOR: #793B0D;
COLOR:#4D4D4D;
PADDING-RIGHT: 0;
FONT-SIZE: 14px;
DISPLAY: block;
PADDING-LEFT: 10px;
PADDING-BOTTOM: 0;
PADDING-TOP: 0;
BORDER-BOTTOM: 1px solid;
HEIGHT: 1%;
TEXT-DECORATION: none
TEXT-DECORATION: none;
 
}
#latnavLeft LI A:hover,#latnavRight LI A:hover
#latnavLeft LI A:hover
{
COLOR: #793B0D;
BACKGROUND-COLOR: #ffffcc
COLOR:#8EC73F;
FONT-SIZE: 14px;
 
}
#latnavLeft LI A:visited,#latnavRight LI A:visited
#latnavLeft LI A:visited
{
PADDING-RIGHT: 0;
DISPLAY: block;
PADDING-LEFT: 10px;
PADDING-BOTTOM: 0;
PADDING-TOP: 0;
BORDER-BOTTOM: 1px solid;
HEIGHT: 1%;
TEXT-DECORATION: none
FONT-SIZE: 14px;
TEXT-DECORATION: none;
}
#latnavLeft A,#latnavRight A
 
#latnavLeft A
{
PADDING-LEFT: 5px
PADDING-LEFT: 5px ;
FONT-SIZE: 14px;
}
/* /latnav */
 
366,21 → 457,19
#content
{
BORDER-RIGHT: 1px solid;
PADDING-RIGHT: 10px;
BORDER-TOP: 1px solid;
PADDING-LEFT: 10px;
RIGHT: 0;
LEFT: 0;
PADDING-BOTTOM: 10px;
VERTICAL-ALIGN: top;
BORDER-LEFT: 1px solid;
PADDING-TOP: 10px;
BORDER-BOTTOM: 1px solid
 
}
#content P
{
PADDING-TOP: 10px;
TEXT-ALIGN: justify
TEXT-ALIGN: justify;
}
/* /Content */
 
393,9 → 482,6
#footer
{
COLOR: black;
BORDER-TOP-COLOR: black;
BACKGROUND-COLOR: white;
BORDER-TOP: 2px solid;
PADDING-LEFT: 5px;
FONT-SIZE: 0.9em;
LEFT: 0;
455,30 → 541,38
margin:0;
padding:0;
}
 
.box a:hover
{
text-decoration: underline;
color:#8EC73F;
}
 
.box th
{
 
margin:0;
padding-left:10px;
padding-top:3px;
padding-bottom:3px;
padding-top:2px;
padding-right:15px;
color:#793B0D;
background-color: #FFD8BB;
border: 1px solid #793B0D;
font-weight: bold;
color:#FFFFFF;
background-color: #8EC73F;
font-weight: bold;
}
.box li
{
text-decoration: underline;
}
 
}
.box td
{
margin:0;
padding-left:15px;
padding-left:5px;
padding-top:3px;
padding-bottom:3px;
padding-right:15px;
color:#793B0D;
background-color: #FFD8BB;
border: 1px solid #793B0D;
text-align: left;
}
.box td ul
{
/impl/src/web/layout/navigationRight.jsp
6,7 → 6,6
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
<div id="latnavRight">
<p>Avisos</p>
<jsp:include page="/public/announcements/announcements.jsp"/>
 
/impl/src/web/layout/navigationLeftMenu.jsp
New file
0,0 → 1,36
<%--
Created by IntelliJ IDEA.
User: Fabio Velez
Date: 14/Mar/2008
Time: 16:50:15
To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %>
<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
 
<div id="navigationLeftMenu">
<ul>
<li>
<a href="http://www.estgp.pt/Alunos/HomeAlunos.asp">Alunos</a>
</li>
<li>
<a href="http://www.estgp.pt/Alunos/HomeAlunos.asp">Docentes</a>
</li>
<li>
<a href="http://www.estgp.pt/Alunos/HomeAlunos.asp">Futuros Alunos</a>
</li>
<li>
<a href="http://www.estgp.pt/Alunos/HomeAlunos.asp">Antigos Alunos</a>
</li>
<li>
<a href="http://www.estgp.pt/Alunos/HomeAlunos.asp">Alunos Internacionais</a>
</li>
<li>
<a href="http://www.estgp.pt/Alunos/HomeAlunos.asp">Comunicação Social</a>
</li>
</ul>
</div>
/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/src/web/layout/navigationLeft.jsp
10,7 → 10,7
 
<%--ANONIMOUS MENUS--%>
<jsp:include page="/layout/navigationTop.jsp"/>
 
<jsp:include page="/layout/navigationLeftMenu.jsp"/>
<%--SUPER USER MENUS--%>
<estgweb:isSuperUser>
<p><bean:message key="superuser"/></p>
/impl/src/web/public/index.jsp
3,8 → 3,14
<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/tlds/jomm.tld" prefix="jomm" %>
 
<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
<jomm:messages/>
<html:errors/>
 
Benvindos ao site da ESTG
<table id="indexPage">
<tr>
<td id="topBar">
<bean:message key="mainAnnouncements"/>
</td>
</tr>
</table>
/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="**/*"/>
236,6 → 240,9
<fileset dir="${common.lib.dir}/struts">
<include name="**/*.jar"/>
</fileset>
<fileset dir="${common.lib.dir}/ldap">
<include name="**/*.jar"/>
</fileset>
</copy>
<copy file="${dist.dir}/estgweb.jar" todir="${build.dir.war}/WEB-INF/lib"/>
<copy todir="${build.dir.war}/WEB-INF" overwrite="true">
332,18 → 339,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