Grouper-Esup : configurations classiques Grouper 2_3_0 d'établissemen…

…ts Esup - cf https://www.esup-portail.org/wiki/display/PROJESUPGRP/Installation%2C+configuration+et+exploitation+de+Grouper

.gitignore

@@ -2,23 +2,9 @@
 **/classes
 **/.idea
 **/*.iml
-/**/bin/*
 **/*.log
-grouper.*
 grouper/logs/
-grouper/build.properties
 grouper/build.log
-grouper/conf/ehcache.xml
-grouper/conf/grouper.client.properties
-grouper/conf/grouper.hibernate.properties
-grouper/conf/grouper.properties
-grouper/conf/grouper-loader.properties
-grouper/conf/log4j.properties
-grouper/conf/morphString.properties
-grouper/conf/server.properties
-grouper/conf/sources.xml
-grouper/conf/spy.properties
-grouper/conf/subject.properties
 grouper/conf/dist/
 grouper/ddlScripts/
 grouper/dist/

grouper-ui/.gitignore

@@ -1,6 +1,7 @@
 .lastbuild.properties
 build.properties
 dist
+build
 logs
 spy.log
 temp

grouper-ui/conf/.gitignore

@@ -1 +1 @@
-/grouper-ui.properties
+

grouper-ui/conf/grouper-ui.properties

@@ -0,0 +1,12 @@
+#
+# Grouper UI configuration
+# $Id: grouper.client.example.properties,v 1.24 2009-12-30 04:23:02 mchyzer Exp $
+#
+
+# The grouper-ui.properties uses Grouper Configuration Overlays (documented on wiki)
+# By default the configuration is read from grouper-ui.base.properties
+# (which should not be edited), and the grouper-ui.properties overlays
+# the base settings.  See the grouper-ui.base.properties for the possible
+# settings that can be applied to the grouper-ui.properties
+
+image.organisation-logo=grouperExternal/public/assets/images/logo-esup.svg

grouper-ui/conf/grouperText/grouper.text.en.us.base.properties

@@ -13,7 +13,7 @@
 # comma separated config files that override each other (files on the right override the left)
 # each should start with file: or classpath:
 # e.g. classpath:grouperText/grouper.text.en.us.base.properties, file:c:/temp/grouperText/grouper.text.en.us.properties
-text.config.hierarchy = classpath:grouperText/grouper.text.en.us.base.properties, classpath:grouperText/grouper.text.en.us.properties
+text.config.hierarchy = classpath:grouperText/grouper.text.en.us.base.properties, classpath:grouperText/grouper.text.fr.fr.base.properties, classpath:grouperText/grouper.text.fr.fr.properties
 
 # seconds between checking to see if the config files are updated
 text.config.secondsBetweenUpdateChecks = 60

grouper-ui/conf/grouperText/grouper.text.fr.fr.properties

@@ -0,0 +1,17 @@
+#
+# Grouper UI text Configuration
+#
+# Grouper UI text config uses Grouper Configuration Overlays (documented on wiki)
+# By default the configuration is read from grouper.text.language.country.base.properties
+# (which should not be edited), and the grouper.text.language.country.properties overlays
+# the base settings.  See the grouper.text.language.country.base.properties for the possible
+# settings that can be applied to the grouper.text.language.country.properties
+# Note: each language and country must be configured in the grouper-ui.properties
+
+grouperAppName = Grouper
+institutionName = Universit\u00E9 de Ville - EsupPortail - Grouper Internet2
+indexGrouperDescription = Cette application permet de g\u00E9rer les groupes de l'universit\u00E9 de Ville ainsi que leurs membres. <br /> Vous pouvez configurer l'affichage de cette page d'accueil en cliquant sur les engrenages des colonnes ci-dessous. <br /> Si vous avez des questions sur l'utilisation de ce logiciel, merci de contacter la DSI. 
+# La configuration des textes utilise le mécanisme Grouper Configuration Overlays
+# Par défaut la configuration est lue dans le fichier de base
+# (ne pas l'éditer), et dans les fichiers "overlays" 
+

grouper-ui/webapp/WEB-INF/struts-config.xml

@@ -235,7 +235,7 @@
     <forward name="Groups" path="/populateMyGroups.do" redirect="false"/>
 	<forward name="Index" path="/populateIndex.do" redirect="true"/>
 
-	<forward name="Login" path="/login.do" redirect="true"/>
+	<forward name="Login" path="/home.do" redirect="true"/>
 	<forward name="ErrorPage" path="ErrorPageDef" redirect="false"/>
 	<forward name="FilterError" path="/filterError.do" redirect="false"/>
   </global-forwards>
@@ -366,7 +366,7 @@
             type="edu.internet2.middleware.grouper.ui.actions.CallLoginAction"
             unknown="false" validate="false">
 
-      <forward name="callLogin" path="/login.do" redirect="true"/>
+      <forward name="callLogin" path="/home.do" redirect="true"/>
     </action>
 
     <action name="GroupFormBean" path="/deleteGroup" scope="request"

grouper-ui/webapp/WEB-INF/web.ajax.xml

@@ -66,46 +66,4 @@
     <url-pattern>/grouperExternal/public/UiV2Public.postIndex</url-pattern>
   </servlet-mapping>
 
-
-  <security-constraint>
-    <web-resource-collection>
-      <web-resource-name>UI</web-resource-name>
-      <url-pattern>/grouperUi/app/*</url-pattern>
-    </web-resource-collection>
-    <auth-constraint>
-      <role-name>*</role-name>
-    </auth-constraint>
-  </security-constraint>
-
-  <security-constraint>
-    <web-resource-collection>
-      <web-resource-name>UI</web-resource-name>
-      <url-pattern>/grouperUi/appHtml/*</url-pattern>
-    </web-resource-collection>
-    <auth-constraint>
-      <role-name>*</role-name>
-    </auth-constraint>
-  </security-constraint>
-
-  <security-constraint>
-    <web-resource-collection>
-      <web-resource-name>UI</web-resource-name>
-      <url-pattern>/grouperExternal/app/*</url-pattern>
-    </web-resource-collection>
-    <auth-constraint>
-      <role-name>*</role-name>
-    </auth-constraint>
-  </security-constraint>
-
-  <security-constraint>
-    <web-resource-collection>
-      <web-resource-name>UI</web-resource-name>
-      <url-pattern>/grouperExternal/appHtml/*</url-pattern>
-    </web-resource-collection>
-    <auth-constraint>
-      <role-name>*</role-name>
-    </auth-constraint>
-  </security-constraint>
-
-
 </web-app>

grouper-ui/webapp/WEB-INF/web.core.xml

@@ -90,28 +90,4 @@
     <url-pattern>*.do</url-pattern>
   </servlet-mapping>
 
-   <security-constraint>
-    <web-resource-collection>
-      <web-resource-name>Tomcat login</web-resource-name>
-      <url-pattern>/login.do</url-pattern>
-    </web-resource-collection>
-    <auth-constraint>
-       <!-- NOTE:  This role is not present in the default users file -->
-       <role-name>@grouper.role@</role-name>
-    </auth-constraint>
-  </security-constraint>
-
-  <!-- Define the Login Configuration for this Application -->
-  <login-config>
-    <auth-method>BASIC</auth-method>
-    <realm-name>Grouper Application</realm-name>
-  </login-config>
-
-  <!-- Security roles referenced by this web application -->
-  <security-role>
-    <description>
-      The role that is required to log in to the Grouper UI
-    </description>
-    <role-name>@grouper.role@</role-name>
-  </security-role>
-</web-app>
+</web-app>

grouper/.gitignore

@@ -1,18 +1,10 @@
 build
-conf/ehcache.xml
-conf/grouper.client.properties
-conf/grouper.hibernate.properties
-conf/grouper.properties
-conf/grouper-loader.properties
-conf/ldap.properties
-conf/log4j.properties
-conf/morphString.properties
-conf/sources.xml
-conf/spy.properties
-conf/penn*
 ddlScripts
 dist
 misc/server/i2midev1
 spy.log
 temp
 test.log
+conf/spy.properties
+conf/subject.properties
+ext/lib/temp.txt