diff --git a/.gitignore b/.gitignore index 0f1b169..d16077a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,8 @@ -private/ -/dist/ +**/nbproject/private/ +**/nbproject/Makefile-*.mk +**/nbproject/Package-*.bash +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ \ No newline at end of file diff --git a/build/built-jar.properties b/build/built-jar.properties index 6a3933c..9affc37 100644 --- a/build/built-jar.properties +++ b/build/built-jar.properties @@ -1,4 +1,4 @@ -#Thu, 14 Mar 2024 23:18:06 -0600 +#Sun, 17 Mar 2024 13:36:38 -0600 C\:\\Users\\juanl\\Documents\\SalaDeConciertos= diff --git a/build/classes/Controlador/ControladorBoleto.class b/build/classes/Controlador/ControladorBoleto.class index 4886055..e2f4a63 100644 Binary files a/build/classes/Controlador/ControladorBoleto.class and b/build/classes/Controlador/ControladorBoleto.class differ diff --git a/build/classes/Controlador/ControladorEcenario.class b/build/classes/Controlador/ControladorEcenario.class index 57f338b..4aa228d 100644 Binary files a/build/classes/Controlador/ControladorEcenario.class and b/build/classes/Controlador/ControladorEcenario.class differ diff --git a/build/classes/Controlador/ControladorLogin.class b/build/classes/Controlador/ControladorLogin.class index f398469..34af14c 100644 Binary files a/build/classes/Controlador/ControladorLogin.class and b/build/classes/Controlador/ControladorLogin.class differ diff --git a/build/classes/Controlador/ControladorRegistro$1.class b/build/classes/Controlador/ControladorRegistro$1.class index 0d5944e..2d7c1e1 100644 Binary files a/build/classes/Controlador/ControladorRegistro$1.class and b/build/classes/Controlador/ControladorRegistro$1.class differ diff --git a/build/classes/Controlador/ControladorRegistro$2.class b/build/classes/Controlador/ControladorRegistro$2.class index 4b19d0d..39ed6b4 100644 Binary files a/build/classes/Controlador/ControladorRegistro$2.class and b/build/classes/Controlador/ControladorRegistro$2.class differ diff --git a/build/classes/Controlador/ControladorRegistro.class b/build/classes/Controlador/ControladorRegistro.class index 10a14ec..cc5e743 100644 Binary files a/build/classes/Controlador/ControladorRegistro.class and b/build/classes/Controlador/ControladorRegistro.class differ diff --git a/build/classes/Main/Main.class b/build/classes/Main/Main.class index fca2d4a..fc8bf1e 100644 Binary files a/build/classes/Main/Main.class and b/build/classes/Main/Main.class differ diff --git a/build/classes/Modelo/Asiento.class b/build/classes/Modelo/Asiento.class index 8dbc411..8111f34 100644 Binary files a/build/classes/Modelo/Asiento.class and b/build/classes/Modelo/Asiento.class differ diff --git a/build/classes/Modelo/Conexion.class b/build/classes/Modelo/Conexion.class index e48368c..6f71bd1 100644 Binary files a/build/classes/Modelo/Conexion.class and b/build/classes/Modelo/Conexion.class differ diff --git a/build/classes/Modelo/Consulta.class b/build/classes/Modelo/Consulta.class index ba2895d..b7563a5 100644 Binary files a/build/classes/Modelo/Consulta.class and b/build/classes/Modelo/Consulta.class differ diff --git a/build/classes/Modelo/Sala.class b/build/classes/Modelo/Sala.class index 3cc5d1c..d32e4fd 100644 Binary files a/build/classes/Modelo/Sala.class and b/build/classes/Modelo/Sala.class differ diff --git a/build/classes/Modelo/Usuario.class b/build/classes/Modelo/Usuario.class index 35db93e..18cae0b 100644 Binary files a/build/classes/Modelo/Usuario.class and b/build/classes/Modelo/Usuario.class differ diff --git a/build/classes/Modelo/Zona.class b/build/classes/Modelo/Zona.class index 553e17f..d68f434 100644 Binary files a/build/classes/Modelo/Zona.class and b/build/classes/Modelo/Zona.class differ diff --git a/build/classes/Vista/ConfirmacionPago.class b/build/classes/Vista/ConfirmacionPago.class index 4cc4cb8..dae17be 100644 Binary files a/build/classes/Vista/ConfirmacionPago.class and b/build/classes/Vista/ConfirmacionPago.class differ diff --git a/build/classes/Vista/Login.class b/build/classes/Vista/Login.class index 3395d09..3436ba4 100644 Binary files a/build/classes/Vista/Login.class and b/build/classes/Vista/Login.class differ diff --git a/build/classes/Vista/MetodoPago$1.class b/build/classes/Vista/MetodoPago$1.class index 7521066..3e75688 100644 Binary files a/build/classes/Vista/MetodoPago$1.class and b/build/classes/Vista/MetodoPago$1.class differ diff --git a/build/classes/Vista/MetodoPago$2.class b/build/classes/Vista/MetodoPago$2.class index 9ae5d5f..1905c97 100644 Binary files a/build/classes/Vista/MetodoPago$2.class and b/build/classes/Vista/MetodoPago$2.class differ diff --git a/build/classes/Vista/MetodoPago$3.class b/build/classes/Vista/MetodoPago$3.class index ba72f0f..351269e 100644 Binary files a/build/classes/Vista/MetodoPago$3.class and b/build/classes/Vista/MetodoPago$3.class differ diff --git a/build/classes/Vista/MetodoPago.class b/build/classes/Vista/MetodoPago.class index bdec8c8..3a85959 100644 Binary files a/build/classes/Vista/MetodoPago.class and b/build/classes/Vista/MetodoPago.class differ diff --git a/build/classes/Vista/Registro.class b/build/classes/Vista/Registro.class index 1e60201..e9ea532 100644 Binary files a/build/classes/Vista/Registro.class and b/build/classes/Vista/Registro.class differ diff --git a/build/classes/Vista/SalaPrincipal.class b/build/classes/Vista/SalaPrincipal.class index 4cc27c5..be9997e 100644 Binary files a/build/classes/Vista/SalaPrincipal.class and b/build/classes/Vista/SalaPrincipal.class differ diff --git a/build/classes/Vista/seleccionarBoleto$1.class b/build/classes/Vista/seleccionarBoleto$1.class deleted file mode 100644 index 2a13a2d..0000000 Binary files a/build/classes/Vista/seleccionarBoleto$1.class and /dev/null differ diff --git a/build/classes/Vista/seleccionarBoleto.class b/build/classes/Vista/seleccionarBoleto.class index ebf1f7a..31a6038 100644 Binary files a/build/classes/Vista/seleccionarBoleto.class and b/build/classes/Vista/seleccionarBoleto.class differ diff --git a/dist/SalaDeConciertos.jar b/dist/SalaDeConciertos.jar deleted file mode 100644 index 8f1d095..0000000 Binary files a/dist/SalaDeConciertos.jar and /dev/null differ diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 32f17e2..f99bfdd 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -619,7 +619,7 @@ is divided into following sections: - + @@ -716,7 +716,7 @@ is divided into following sections: - + @@ -1057,7 +1057,7 @@ is divided into following sections: - + @@ -1728,7 +1728,7 @@ is divided into following sections: - + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index a64340c..703e53d 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=5884f2aa -build.xml.script.CRC32=ab1cdf62 +build.xml.data.CRC32=a85e8ef6 +build.xml.script.CRC32=35ba6521 build.xml.stylesheet.CRC32=f85dc8f2@1.108.0.48 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=5884f2aa -nbproject/build-impl.xml.script.CRC32=cac1410a +nbproject/build-impl.xml.data.CRC32=a85e8ef6 +nbproject/build-impl.xml.script.CRC32=06c4ba97 nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.108.0.48 diff --git a/nbproject/project.properties b/nbproject/project.properties index eff1744..2eb6d74 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -28,16 +28,26 @@ debug.test.modulepath=\ dist.archive.excludes= # This directory is removed when the project is cleaned: dist.dir=dist -dist.jar=${dist.dir}/SalaDeConciertos.jar +dist.jar=${dist.dir}/Decorator.jar dist.javadoc.dir=${dist.dir}/javadoc dist.jlink.dir=${dist.dir}/jlink -dist.jlink.output=${dist.jlink.dir}/SalaDeConciertos +dist.jlink.output=${dist.jlink.dir}/Decorator excludes= +file.reference.javax-inject.jar=src\\Recursos\\javax-inject.jar +file.reference.javax.activation-1.1.0.v201105071233.jar=src\\Recursos\\javax.activation-1.1.0.v201105071233.jar +file.reference.javax.ejb.jar=src\\Recursos\\javax.ejb.jar +file.reference.javax.faces-api-2.0.jar=src\\Recursos\\javax.faces-api-2.0.jar +file.reference.mail.jar=src\\Recursos\\mail.jar file.reference.mysql-connector-java-8.0.30.jar=src\\Recursos\\mysql-connector-java-8.0.30.jar includes=** jar.compress=false javac.classpath=\ - ${file.reference.mysql-connector-java-8.0.30.jar} + ${file.reference.mysql-connector-java-8.0.30.jar}:\ + ${file.reference.javax-inject.jar}:\ + ${file.reference.javax.activation-1.1.0.v201105071233.jar}:\ + ${file.reference.javax.ejb.jar}:\ + ${file.reference.javax.faces-api-2.0.jar}:\ + ${file.reference.mail.jar} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false @@ -46,8 +56,8 @@ javac.modulepath= javac.processormodulepath= javac.processorpath=\ ${javac.classpath} -javac.source=20 -javac.target=20 +javac.source=21 +javac.target=21 javac.test.classpath=\ ${javac.classpath}:\ ${build.classes.dir} @@ -72,7 +82,7 @@ jlink.additionalmodules= # The jlink additional command line parameters jlink.additionalparam= jlink.launcher=true -jlink.launcher.name=SalaDeConciertos +jlink.launcher.name=Decorator main.class=Main.Main manifest.file=manifest.mf meta.inf.dir=${src.dir}/META-INF diff --git a/nbproject/project.xml b/nbproject/project.xml new file mode 100644 index 0000000..df94d3d --- /dev/null +++ b/nbproject/project.xml @@ -0,0 +1,15 @@ + + + org.netbeans.modules.java.j2seproject + + + SalaDeConciertos + + + + + + + + + diff --git a/src/Modelo/EnviarCorreo.java b/src/Modelo/EnviarCorreo.java index 423e88e..544d108 100644 --- a/src/Modelo/EnviarCorreo.java +++ b/src/Modelo/EnviarCorreo.java @@ -1,7 +1,3 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template - */ package Modelo; import java.util.Properties; diff --git a/src/Recursos/javax-inject.jar b/src/Recursos/javax-inject.jar new file mode 100644 index 0000000..4c86c52 Binary files /dev/null and b/src/Recursos/javax-inject.jar differ diff --git a/src/Recursos/javax.activation-1.1.0.v201105071233.jar b/src/Recursos/javax.activation-1.1.0.v201105071233.jar new file mode 100644 index 0000000..cb35913 Binary files /dev/null and b/src/Recursos/javax.activation-1.1.0.v201105071233.jar differ diff --git a/src/Recursos/javax.ejb.jar b/src/Recursos/javax.ejb.jar new file mode 100644 index 0000000..4ebf5ec Binary files /dev/null and b/src/Recursos/javax.ejb.jar differ diff --git a/src/Recursos/javax.faces-api-2.0.jar b/src/Recursos/javax.faces-api-2.0.jar new file mode 100644 index 0000000..58467c1 Binary files /dev/null and b/src/Recursos/javax.faces-api-2.0.jar differ diff --git a/src/Recursos/mail.jar b/src/Recursos/mail.jar new file mode 100644 index 0000000..300f436 Binary files /dev/null and b/src/Recursos/mail.jar differ