From jboss-identity-commits at lists.jboss.org Mon Feb  2 16:05:21 2009
Content-Type: multipart/mixed; boundary="===============5939687472249157579=="
MIME-Version: 1.0
From: jboss-identity-commits at lists.jboss.org
To: jboss-identity-commits at lists.jboss.org
Subject: [jboss-identity-commits] JBoss Identity SVN: r273 - in
 idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl: configuration/jaxb2
 and 1 other directory.
Date: Mon, 02 Feb 2009 16:05:20 -0500
Message-ID: <E1LU5yq-0000o3-QE@committer01.frg.pub.inap.atl.jboss.com>

--===============5939687472249157579==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2009-02-02 16:05:20 -0500 (Mon, 02 Feb 2009)
New Revision: 273

Modified:
   idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/IdentitySess=
ionFactoryImpl.java
   idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/configuration/ja=
xb2/JAXB2IdentityConfiguration.java
Log:
patch from TomB. Pass configuration with resource

Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/Ident=
itySessionFactoryImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/IdentitySes=
sionFactoryImpl.java	2009-02-02 21:04:42 UTC (rev 272)
+++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/IdentitySes=
sionFactoryImpl.java	2009-02-02 21:05:20 UTC (rev 273)
@@ -45,6 +45,7 @@
 =

 /**
  * @author <a href=3D"mailto:boleslaw.dawidowicz at redhat.com">Boleslaw D=
awidowicz</a>
+ * @author Tom Baeyens
  * @version : 0.1 $
  */
 public class IdentitySessionFactoryImpl implements IdentitySessionFactory
@@ -70,6 +71,14 @@
 =

    }
 =

+   public IdentitySessionFactoryImpl(String configResource) throws Excepti=
on
+   {
+      IdentityConfigurationMetaData configMD =3D JAXB2IdentityConfiguratio=
n.createConfigurationMetaData(configResource);
+
+      realmMap =3D createSessionMap(configMD);
+
+   }
+
    private Map<String, IdentitySession> createSessionMap(IdentityConfigura=
tionMetaData configMD) throws Exception
    {
       //TODO: some validation, sanity checks and error reporting

Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/configura=
tion/jaxb2/JAXB2IdentityConfiguration.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/configuration/j=
axb2/JAXB2IdentityConfiguration.java	2009-02-02 21:04:42 UTC (rev 272)
+++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/configuration/j=
axb2/JAXB2IdentityConfiguration.java	2009-02-02 21:05:20 UTC (rev 273)
@@ -56,6 +56,9 @@
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
@@ -65,6 +68,7 @@
 =

 /**
  * @author <a href=3D"mailto:boleslaw.dawidowicz at redhat.com">Boleslaw D=
awidowicz</a>
+ * @author Tom Baeyens
  * @version : 0.1 $
  */
 public abstract class JAXB2IdentityConfiguration
@@ -79,16 +83,43 @@
       attributeTypes.add("binary");
    }
 =

+   public static IdentityConfigurationMetaData createConfigurationMetaData=
(File configFile) throws IdentityConfigurationException
+   {
+      if (configFile =3D=3D null)
+      {
+         throw new IllegalArgumentException("Identity config file is null"=
);
+      }
+      =

+      InputStream inputStream;
+      try
+      {
+         inputStream =3D new FileInputStream(configFile);
+      } catch (FileNotFoundException e)
+      {
+         throw new IllegalArgumentException("Identity config file "+config=
File.getAbsolutePath()+" does not exist");
+      }
+      return createConfigurationMetaData(inputStream);
+   }
 =

-
-   public static IdentityConfigurationMetaData createConfigurationMetaData=
(File xmlConfig) throws IdentityConfigurationException
+   public static IdentityConfigurationMetaData createConfigurationMetaData=
(String configResource) throws IdentityConfigurationException
    {
 =

-      if (xmlConfig =3D=3D null || !xmlConfig.exists())
+      ClassLoader classLoader =3D Thread.currentThread().getContextClassLo=
ader();
+      InputStream inputStream =3D classLoader.getResourceAsStream(configRe=
source);
+      if (inputStream =3D=3D null)
       {
-         throw new IllegalArgumentException("File does not exist");
+         throw new IllegalArgumentException("Resource "+configResource+" d=
oes not exist");
       }
+      return createConfigurationMetaData(inputStream);
+   }
 =

+   public static IdentityConfigurationMetaData createConfigurationMetaData=
(InputStream configInputStream) throws IdentityConfigurationException
+   {
+      if (configInputStream =3D=3D null)
+      {
+         throw new IllegalArgumentException("no config resource");
+      }
+
       JAXBElement<JbossIdentityType> jiElement =3D null;
 =

       Object o =3D null;
@@ -97,7 +128,7 @@
          JAXBContext jaxbContext =3D JAXBContext.newInstance("org.jboss.id=
entity.idm.impl.configuration.jaxb2.generated");
          Unmarshaller unMarshaller =3D jaxbContext.createUnmarshaller();
 =

-         jiElement =3D (JAXBElement<JbossIdentityType>)unMarshaller.unmars=
hal(xmlConfig);
+         jiElement =3D (JAXBElement<JbossIdentityType>)unMarshaller.unmars=
hal(configInputStream);
       }
       catch (JAXBException e)
       {


--===============5939687472249157579==--